Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-02-15 03:41:22 +01:00
Code Issues Projects Releases Wiki Activity

Bake income should work now

Browse Source
This commit is contained in:
montlikadani 2019-10-26 12:06:21 +02:00
parent c825a2de56
commit d98bb4aaf9
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -24,3 +24,4 @@
- Fixed issue when used 1.12 and lower versions then some materials not work correctly. - Fixed issue when used 1.12 and lower versions then some materials not work correctly.
- Added option to jobs shop to hide icon if a player there are no enough points to buy a item - Added option to jobs shop to hide icon if a player there are no enough points to buy a item
- Fixed issue for inventory dragging when a player is in jobs GUI. - Fixed issue for inventory dragging when a player is in jobs GUI.
- Added new action type: Bake, to cooking foods with campfire.

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

@ -435,8 +435,8 @@ public class LanguageManager {
c.get("command.info.output.custom-kill.none", "%jobname% does not get money from custom player kills."); 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.info", "&eCollect");
c.get("command.info.output.collect.none", "%jobname% does not get money for collecting blocks."); c.get("command.info.output.collect.none", "%jobname% does not get money for collecting blocks.");
c.get("command.info.output.cook.info", "&eCook"); c.get("command.info.output.bake.info", "&eBake");
c.get("command.info.output.cook.none", "%jobname% does not get money for cooking foods."); c.get("command.info.output.bake.none", "%jobname% does not get money for cooking foods.");
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.info", "Show how much each job is getting paid and for what on another player.");
c.get("command.playerinfo.help.args", "[playername] [jobname] [action]"); c.get("command.playerinfo.help.args", "[playername] [jobname] [action]");

4
src/main/java/com/gamingmesh/jobs/listeners/JobsPayment14Listener.java
View File

@ -50,10 +50,12 @@ public class JobsPayment14Listener implements Listener {
if (jPlayer == null) if (jPlayer == null)
return; return;
Jobs.action(jPlayer, new ItemActionInfo(event.getResult(), ActionType.BAKE)); Jobs.action(jPlayer, new ItemActionInfo(event.getSource(), ActionType.BAKE));
if (camps.getValue().getItem().equals(event.getSource())) {
it.remove(); it.remove();
} }
} }
}
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onCampPlace(PlayerInteractEvent ev) { public void onCampPlace(PlayerInteractEvent ev) {