diff --git a/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java b/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java index 3e74cc8b..c5967895 100644 --- a/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java @@ -418,6 +418,8 @@ public class LanguageManager { c.get("command.info.output.explore.none", "%jobname% does not get money from exploring."); c.get("command.info.output.custom-kill.info", "&eCustom kill"); c.get("command.info.output.custom-kill.none", "%jobname% does not get money from custom player kills."); + c.get("command.info.output.collect.info", "&eCollect"); + c.get("command.info.output.collect.none", "%jobname% does not get money for collecting blocks."); c.get("command.playerinfo.help.info", "Show how much each job is getting paid and for what on another player."); c.get("command.playerinfo.help.args", "[playername] [jobname] [action]"); diff --git a/src/main/java/com/gamingmesh/jobs/container/JobItems.java b/src/main/java/com/gamingmesh/jobs/container/JobItems.java index cdcbd313..774446e3 100644 --- a/src/main/java/com/gamingmesh/jobs/container/JobItems.java +++ b/src/main/java/com/gamingmesh/jobs/container/JobItems.java @@ -46,12 +46,10 @@ public class JobItems { public JobItems(String node, CMIMaterial mat, int amount, String name, List lore, HashMap enchants, BoostMultiplier boostMultiplier, List jobs) { mat = mat == null ? CMIMaterial.STONE : mat; try { - item = mat.newItemStack(); - item.setAmount(amount); this.enchants = enchants; + item = mat.newItemStack(); + ItemMeta meta = item.getItemMeta(); - if (meta == null) - return; if (name != null) meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', name)); @@ -71,6 +69,7 @@ public class JobItems { } } item.setItemMeta(meta); + item.setAmount(amount); item = Jobs.getReflections().setNbt(item, "JobsItemBoost", node); } catch (Throwable e) { e.printStackTrace(); diff --git a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java index 10981973..667a129d 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java @@ -707,12 +707,6 @@ public class JobsPaymentListener implements Listener { } - @SuppressWarnings("unused") - @Deprecated - private Integer schedulePostDetection(final HumanEntity player, final ItemStack compareItem, final JobsPlayer jPlayer, final ItemStack resultStack) { - return schedulePostDetection(player, compareItem, jPlayer, resultStack, ActionType.CRAFT); - } - // HACK! The API doesn't allow us to easily determine the resulting number of // crafted items, so we're forced to compare the inventory before and after. private Integer schedulePostDetection(final HumanEntity player, final ItemStack compareItem, final JobsPlayer jPlayer, final ItemStack resultStack, final ActionType type) { diff --git a/src/main/resources/locale/messages_hu.yml b/src/main/resources/locale/messages_hu.yml index c114464c..d4117023 100644 --- a/src/main/resources/locale/messages_hu.yml +++ b/src/main/resources/locale/messages_hu.yml @@ -347,6 +347,9 @@ command: custom-kill: info: '&eEgyéni gyilkolás' none: '%jobname%&c nem kap pénzt, ha játékost gyilkol.' + collect: + info: '&eGyűjtés' + none: '%jobname%&c nem kap pénzt, ha gyűjtöget anyagokat.' playerinfo: help: info: 'Megmutassa mennyi minden munkát fizet, és mi van egy másik játékosnál.'