diff --git a/pom.xml b/pom.xml index b5881f29..5d76c602 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Jobs jobs - 4.7.2 + 4.7.3 Jobs http://maven.apache.org @@ -125,14 +125,14 @@ 1.7 - + diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/CMIEffect.java b/src/main/java/com/gamingmesh/jobs/CMILib/CMIEffect.java index c67f4550..5427bcc3 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/CMIEffect.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/CMIEffect.java @@ -1,3 +1,6 @@ +/** + * Copyright (C) 2017 Zrips + */ package com.gamingmesh.jobs.CMILib; import org.bukkit.Color; diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/CMIEffectManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/CMIEffectManager.java index 7dc84385..5af1b308 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/CMIEffectManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/CMIEffectManager.java @@ -1,3 +1,6 @@ +/** + * Copyright (C) 2017 Zrips + */ package com.gamingmesh.jobs.CMILib; import java.util.ArrayList; diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/CMIItemStack.java b/src/main/java/com/gamingmesh/jobs/CMILib/CMIItemStack.java index ea700d02..603761d5 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/CMIItemStack.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/CMIItemStack.java @@ -1,3 +1,6 @@ +/** + * Copyright (C) 2017 Zrips + */ package com.gamingmesh.jobs.CMILib; import java.util.ArrayList; diff --git a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java index cee02214..2274a179 100644 --- a/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java +++ b/src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java @@ -1,3 +1,6 @@ +/** + * Copyright (C) 2017 Zrips + */ package com.gamingmesh.jobs.CMILib; import java.util.ArrayList; @@ -744,8 +747,8 @@ public class ItemManager { CHORUS_FLOWER(200, 0, 28542, "Chorus Flower", "CHORUS_FLOWER"), CHORUS_FRUIT(432, 0, 7652, "Chorus Fruit", ""), CHORUS_PLANT(199, 0, 28243, "Chorus Plant", "CHORUS_PLANT"), - CLAY(82, 0, 27880, "Clay", "CLAY"), - CLAY_BALL(337, 0, 24603, "Clay Ball", "Clay"), + CLAY(82, 0, 27880, "Clay", "Clay Block"), + CLAY_BALL(337, 0, 24603, "Clay Ball"), CLOCK(347, 0, 14980, "Clock", "watch"), COAL(263, 0, 29067, "Coal", ""), COAL_BLOCK(173, 0, 27968, "Block of Coal", "COAL_BLOCK"), diff --git a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java index 81fc9ff2..77a85d8c 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java @@ -180,7 +180,7 @@ public class ConfigManager { myKey = myKey.split("-")[0]; } - CMIMaterial material = CMIMaterial.get(myKey); + CMIMaterial material = CMIMaterial.get(myKey + (subType)); if (material == null) material = CMIMaterial.get(myKey.replace(" ", "_").toUpperCase()); @@ -228,8 +228,8 @@ public class ConfigManager { // Break and Place actions MUST be blocks if (actionType == ActionType.BREAK || actionType == ActionType.PLACE) { if (!material.isBlock()) { - Jobs.getPluginLogger().warning("Job " + jobName + " has an invalid " + actionType.getName() + " type property: " + myKey - + "! Material must be a block!"); + Jobs.getPluginLogger().warning("Job " + jobName + " has an invalid " + actionType.getName() + " type property: " + material + + "(" + myKey + ")! Material must be a block!"); return null; } } @@ -878,8 +878,8 @@ public class ConfigManager { // Break and Place actions MUST be blocks if (actionType == ActionType.BREAK || actionType == ActionType.PLACE) { if (!material.isBlock()) { - Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid " + actionType.getName() + " type property: " + key - + "! Material must be a block!"); + Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid " + actionType.getName() + " type property: " + material + + " (" + key + ")! Material must be a block!"); continue; } } @@ -1042,7 +1042,7 @@ public class ConfigManager { case EAT: case CRAFT: case BREAK: - if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)){ + if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) { subType = ""; meta = ""; } diff --git a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java index 7948c7ce..d0d8a991 100644 --- a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java +++ b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java @@ -37,7 +37,7 @@ public class BufferedEconomy { private Jobs plugin; private Economy economy; private LinkedBlockingQueue payments = new LinkedBlockingQueue<>(); - private final Map paymentCache = Collections.synchronizedMap(new HashMap<>()); + private final Map paymentCache = Collections.synchronizedMap(new HashMap()); private OfflinePlayer ServerAccount = null; private OfflinePlayer ServerTaxesAccount = null; diff --git a/src/main/java/com/gamingmesh/jobs/selection/SelectionManager.java b/src/main/java/com/gamingmesh/jobs/selection/SelectionManager.java index 7b3c327b..ad83f9b7 100644 --- a/src/main/java/com/gamingmesh/jobs/selection/SelectionManager.java +++ b/src/main/java/com/gamingmesh/jobs/selection/SelectionManager.java @@ -14,8 +14,8 @@ public class SelectionManager { public static final int MIN_HEIGHT = 0; public SelectionManager() { - playerLoc1 = Collections.synchronizedMap(new HashMap<>()); - playerLoc2 = Collections.synchronizedMap(new HashMap<>()); + playerLoc1 = Collections.synchronizedMap(new HashMap()); + playerLoc2 = Collections.synchronizedMap(new HashMap()); } public void updateLocations(Player player, Location loc1, Location loc2) {