Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-04 23:37:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix some problems

Browse Source 
- Now, if max-level, vip-max-level, slots, and rejoincooldown integers are missing, there will be no error. (fix last commit error)
- Added support for WOOL, to check all wool.
This commit is contained in:
montlikadani 2018-10-10 16:32:02 +02:00
parent e05a7f34af
commit 655a921efa
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java
View File

@ -670,7 +670,7 @@ public class ItemManager {
BLACK_STAINED_GLASS_PANE(160, 15, 13201, "Black Stained Glass Pane", "STAINED_GLASS_PANE"),
BLACK_TERRACOTTA(159, 15, 26691, "Black Terracotta", ""),
BLACK_WALL_BANNER(117, 0, 4919, "Black Banner", ""),
BLACK_WOOL(35, 15, 16693, "Black Wool", ""),
BLACK_WOOL(35, 15, 16693, "Black Wool", "WOOL"),
BLAZE_POWDER(377, 0, 18941, "Blaze Powder", ""),
BLAZE_ROD(369, 0, 8289, "Blaze Rod", ""),
BLAZE_SPAWN_EGG(383, 61, 4759, "Spawn Blaze", "Blaze Spawn Egg"),
@ -687,7 +687,7 @@ public class ItemManager {
BLUE_STAINED_GLASS_PANE(160, 11, 28484, "Blue Stained Glass Pane", ""),
BLUE_TERRACOTTA(159, 11, 5236, "Blue Terracotta", ""),
BLUE_WALL_BANNER(117, 4, 17757, "Blue Banner", ""),
BLUE_WOOL(35, 11, 15738, "Blue Wool", ""),
BLUE_WOOL(35, 11, 15738, "Blue Wool", "WOOL"),
BONE(352, 0, 5686, "Bone", ""),
BONE_BLOCK(216, 0, 17312, "Bone Block", ""),
BONE_MEAL(351, 15, 32458, "Bone Meal", ""),
@ -718,7 +718,7 @@ public class ItemManager {
BROWN_STAINED_GLASS_PANE(160, 12, 17557, "Brown Stained Glass Pane", ""),
BROWN_TERRACOTTA(159, 12, 23664, "Brown Terracotta", ""),
BROWN_WALL_BANNER(117, 3, 14731, "Brown Banner", ""),
BROWN_WOOL(35, 12, 32638, "Brown Wool", ""),
BROWN_WOOL(35, 12, 32638, "Brown Wool", "WOOL"),
BUBBLE_COLUMN(-1, -1, 13758, "Bubble Column", ""),
BUBBLE_CORAL(-1, -1, 12464, "Bubble Coral", ""),
BUBBLE_CORAL_BLOCK(-1, -1, 15437, "Bubble Coral Block", ""),
@ -803,7 +803,7 @@ public class ItemManager {
CYAN_STAINED_GLASS_PANE(160, 9, 11784, "Cyan Stained Glass Pane", ""),
CYAN_TERRACOTTA(159, 9, 25940, "Cyan Terracotta", ""),
CYAN_WALL_BANNER(117, 6, 10889, "Cyan Banner", ""),
CYAN_WOOL(35, 9, 12221, "Cyan Wool", ""),
CYAN_WOOL(35, 9, 12221, "Cyan Wool", "WOOL"),
DAMAGED_ANVIL(145, 2, 10274, "Damaged Anvil", ""),
DANDELION(37, 0, 30558, "Dandelion", "YELLOW_FLOWER"),
DANDELION_YELLOW(351, 11, 21789, "Dandelion Yellow", ""),
@ -958,7 +958,7 @@ public class ItemManager {
GRAY_STAINED_GLASS_PANE(160, 7, 25272, "Gray Stained Glass Pane", ""),
GRAY_TERRACOTTA(159, 7, 18004, "Gray Terracotta", ""),
GRAY_WALL_BANNER(117, 8, 24275, "Gray Banner", ""),
GRAY_WOOL(35, 7, 27209, "Gray Wool", ""),
GRAY_WOOL(35, 7, 27209, "Gray Wool", "WOOL"),
GREEN_BANNER(425, 2, 10698, "Green Banner", ""),
GREEN_BED(355, 13, 13797, "Green Bed", "Green Bed"),
GREEN_CARPET(171, 13, 7780, "Green Carpet", ""),
@ -970,7 +970,7 @@ public class ItemManager {
GREEN_STAINED_GLASS_PANE(160, 13, 4767, "Green Stained Glass Pane", ""),
GREEN_TERRACOTTA(159, 13, 4105, "Green Terracotta", ""),
GREEN_WALL_BANNER(117, 2, 15046, "Green Banner", ""),
GREEN_WOOL(35, 13, 25085, "Green Wool", ""),
GREEN_WOOL(35, 13, 25085, "Green Wool", "WOOL"),
GUARDIAN_SPAWN_EGG(383, 68, 20113, "Spawn Guardian", "Guardian Spawn Egg"),
GUNPOWDER(289, 0, 29974, "Gunpowder", "SULPHUR"),
HAY_BLOCK(170, 0, 17461, "Hay Bale", ""),
@ -1055,7 +1055,7 @@ public class ItemManager {
LIGHT_BLUE_STAINED_GLASS_PANE(160, 3, 18721, "Light Blue Stained Glass Pane", ""),
LIGHT_BLUE_TERRACOTTA(159, 3, 31779, "Light Blue Terracotta", ""),
LIGHT_BLUE_WALL_BANNER(117, 12, 12011, "Light Blue Banner", ""),
LIGHT_BLUE_WOOL(35, 3, 21073, "Light Blue Wool", ""),
LIGHT_BLUE_WOOL(35, 3, 21073, "Light Blue Wool", "WOOL"),
LIGHT_GRAY_BANNER(425, 7, 11417, "Light Gray Banner", ""),
LIGHT_GRAY_BED(355, 8, 5090, "Light Gray Bed", "Light Gray Bed"),
LIGHT_GRAY_CARPET(171, 8, 11317, "Light Gray Carpet", ""),
@ -1068,7 +1068,7 @@ public class ItemManager {
LIGHT_GRAY_STAINED_GLASS_PANE(160, 8, 19008, "Light Gray Stained Glass Pane", ""),
LIGHT_GRAY_TERRACOTTA(159, 8, 26388, "Light Gray Terracotta", ""),
LIGHT_GRAY_WALL_BANNER(117, 7, 31088, "Light Gray Banner", ""),
LIGHT_GRAY_WOOL(35, 8, 22936, "Light Gray Wool", ""),
LIGHT_GRAY_WOOL(35, 8, 22936, "Light Gray Wool", "WOOL"),
LIGHT_WEIGHTED_PRESSURE_PLATE(147, 0, 14875, "Light Weighted Pressure Plate", "GOLD_PLATE"),
LILAC(175, 1, 22837, "Lilac", ""),
LILY_PAD(111, 0, 19271, "Lily Pad", "WATER_LILY"),
@ -1084,7 +1084,7 @@ public class ItemManager {
LIME_STAINED_GLASS_PANE(160, 5, 10610, "Lime Stained Glass Pane", ""),
LIME_TERRACOTTA(159, 5, 24013, "Lime Terracotta", ""),
LIME_WALL_BANNER(117, 10, 21422, "Lime Banner", ""),
LIME_WOOL(35, 5, 10443, "Lime Wool", ""),
LIME_WOOL(35, 5, 10443, "Lime Wool", "WOOL"),
LINGERING_POTION(441, 0, 25857, "Lingering Potion", ""),
LLAMA_SPAWN_EGG(383, 103, 23640, "Spawn Llama", "Llama Spawn Egg"),
MAGENTA_BANNER(425, 13, 15591, "Magenta Banner", ""),
@ -1099,7 +1099,7 @@ public class ItemManager {
MAGENTA_STAINED_GLASS_PANE(160, 2, 14082, "Magenta Stained Glass Pane", ""),
MAGENTA_TERRACOTTA(159, 2, 25900, "Magenta Terracotta", ""),
MAGENTA_WALL_BANNER(117, 13, 23291, "Magenta Banner", ""),
MAGENTA_WOOL(35, 2, 11853, "Magenta Wool", ""),
MAGENTA_WOOL(35, 2, 11853, "Magenta Wool", "WOOL"),
MAGMA_BLOCK(213, 0, 25927, "Magma Block", "MAGMA"),
MAGMA_CREAM(378, 0, 25097, "Magma Cream", ""),
MAGMA_CUBE_SPAWN_EGG(383, 62, 26638, "Spawn Magma Cube", "Magma Cube Spawn Egg"),
@ -1176,7 +1176,7 @@ public class ItemManager {
ORANGE_TERRACOTTA(159, 1, 18684, "Orange Terracotta", ""),
ORANGE_TULIP(38, 5, 26038, "Orange Tulip", ""),
ORANGE_WALL_BANNER(117, 114, 9936, "Orange Banner", ""),
ORANGE_WOOL(35, 1, 23957, "Orange Wool", ""),
ORANGE_WOOL(35, 1, 23957, "Orange Wool", "WOOL"),
OXEYE_DAISY(38, 8, 11709, "Oxeye Daisy", ""),
PACKED_ICE(174, 0, 28993, "Packed Ice", ""),
PAINTING(321, 0, 23945, "Painting", ""),
@ -1200,7 +1200,7 @@ public class ItemManager {
PINK_TERRACOTTA(159, 6, 23727, "Pink Terracotta", ""),
PINK_TULIP(38, 7, 27319, "Pink Tulip", ""),
PINK_WALL_BANNER(117, 9, 9421, "Pink Banner", ""),
PINK_WOOL(35, 6, 7611, "Pink Wool", ""),
PINK_WOOL(35, 6, 7611, "Pink Wool", "WOOL"),
PISTON(33, 0, 21130, "Piston", "PISTON_BASE"),
PISTON_HEAD(34, 0, 30226, "Piston Head", "PISTON_EXTENSION"),
PLAYER_HEAD(397, 3, 21174, "Mob Head (Human)", "Player Head"),
@ -1306,7 +1306,7 @@ public class ItemManager {
PURPLE_STAINED_GLASS_PANE(160, 10, 10948, "Purple Stained Glass Pane", ""),
PURPLE_TERRACOTTA(159, 10, 10387, "Purple Terracotta", ""),
PURPLE_WALL_BANNER(117, 5, 14298, "Purple Banner", ""),
PURPLE_WOOL(35, 10, 11922, "Purple Wool", ""),
PURPLE_WOOL(35, 10, 11922, "Purple Wool", "WOOL"),
PURPUR_BLOCK(201, 0, 7538, "Purpur Block", ""),
PURPUR_PILLAR(202, 0, 26718, "Purpur Pillar", ""),
PURPUR_SLAB(205, 0, 11487, "Purpur Slab", ""),
@ -1348,7 +1348,7 @@ public class ItemManager {
RED_TERRACOTTA(159, 14, 5086, "Red Terracotta", ""),
RED_TULIP(38, 4, 16781, "Red Tulip", ""),
RED_WALL_BANNER(117, 1, 4378, "Red Banner", ""),
RED_WOOL(35, 14, 11621, "Red Wool", ""),
RED_WOOL(35, 14, 11621, "Red Wool", "WOOL"),
REPEATER(356, 0, 28823, "Redstone Repeater", "Diode"),
REPEATING_COMMAND_BLOCK(-1, -1, 12405, "Repeating Command Block", ""),
ROSE_BUSH(175, 4, 6080, "Rose Bush", ""),
@ -1489,7 +1489,7 @@ public class ItemManager {
WHITE_TERRACOTTA(159, 0, 20975, "White Terracotta", ""),
WHITE_TULIP(38, 6, 9742, "White Tulip", ""),
WHITE_WALL_BANNER(425, 15, 15967, "White Banner", ""),
WHITE_WOOL(35, 0, 8624, "White Wool", "Wool"),
WHITE_WOOL(35, 0, 8624, "White Wool", "WOOL"),
WITCH_SPAWN_EGG(383, 66, 11837, "Spawn Witch", "Witch Spawn Egg"),
WITHER_SKELETON_SKULL(397, 1, 31487, "Mob Head (Wither Skeleton)", "Wither Skeleton Skull"),
WITHER_SKELETON_SPAWN_EGG(383, 5, 10073, "Spawn Wither Skeleton", "Wither Skeleton Spawn Egg"),
@ -1513,7 +1513,7 @@ public class ItemManager {
YELLOW_STAINED_GLASS_PANE(160, 4, 20298, "Yellow Stained Glass Pane", ""),
YELLOW_TERRACOTTA(159, 4, 32129, "Yellow Terracotta", ""),
YELLOW_WALL_BANNER(425, 11, 32004, "Yellow Banner", ""),
YELLOW_WOOL(35, 4, 29507, "Yellow Wool", ""),
YELLOW_WOOL(35, 4, 29507, "Yellow Wool", "WOOL"),
ZOMBIE_HEAD(397, 2, 9304, "Mob Head (Zombie)", "Zombie Head"),
ZOMBIE_HORSE_SPAWN_EGG(383, 29, 4275, "Spawn Zombie Horse", "Zombie Horse Spawn Egg"),
ZOMBIE_PIGMAN_SPAWN_EGG(383, 57, 11531, "Spawn Zombie Pigman", "Zombie Pigman Spawn Egg"),

44
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -424,32 +424,30 @@ public class ConfigManager {
continue;
}
int maxLevel = jobSection.getInt("max-level", 0);
if (jobSection.contains("max-level")) {
if (maxLevel < 0)
maxLevel = 0;
}
int maxLevel = jobSection.getInt("max-level", 0);
if (jobSection.isInt("max-level")) {
if (maxLevel < 0)
maxLevel = 0;
}
int vipmaxLevel = jobSection.getInt("vip-max-level", 0);
if (jobSection.contains("vip-max-level")) {
if (vipmaxLevel < 0)
vipmaxLevel = 0;
}
int vipmaxLevel = jobSection.getInt("vip-max-level", 0);
if (jobSection.isInt("vip-max-level")) {
if (vipmaxLevel < 0)
vipmaxLevel = 0;
}
Integer maxSlots = jobSection.getInt("slots", 0);
if (jobSection.contains("slots")) {
if (maxSlots.intValue() <= 0) {
maxSlots = null;
}
}
Integer maxSlots = jobSection.getInt("slots", 0);
if (jobSection.isInt("slots")) {
if (maxSlots.intValue() <= 0)
maxSlots = null;
}
Long rejoinCd = jobSection.getLong("rejoinCooldown", 0L);
if (jobSection.contains("rejoinCooldown")) {
if (rejoinCd < 0L) {
rejoinCd = 0L;
}
rejoinCd = rejoinCd * 1000L;
}
Long rejoinCd = jobSection.getLong("rejoinCooldown", 0L);
if (jobSection.isLong("rejoinCooldown")) {
if (rejoinCd < 0L)
rejoinCd = 0L;
rejoinCd = rejoinCd * 1000L;
}
String jobShortName = jobSection.getString("shortname", null);
if (jobShortName == null) {