Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-25 12:05:16 +01:00
Code Issues Projects Releases Wiki Activity

Forgot to add new action to messages

Browse Source 
https://github.com/Zrips/Jobs/issues/484#issuecomment-512759409
This commit is contained in:
montlikadani 2019-07-18 12:41:07 +02:00
parent 9ed6ed59ee
commit 466ad912f1
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gamingmesh/jobs/config/LanguageManager.java
View File

@ -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]");

7
src/main/java/com/gamingmesh/jobs/container/JobItems.java
View File

@ -46,12 +46,10 @@ public class JobItems {
public JobItems(String node, CMIMaterial mat, int amount, String name, List<String> lore, HashMap<Enchantment, Integer> enchants, BoostMultiplier boostMultiplier, List<Job> 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();

6
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -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) {

3
src/main/resources/locale/messages_hu.yml
View File

@ -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.'