Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-02-18 05:11:32 +01:00
Code Issues Projects Releases Wiki Activity

Forgot to remove drink from files

Browse Source
This commit is contained in:
montlikadani 2019-08-15 16:30:59 +02:00
parent 3ee52815a1
commit e7b5d6ceee
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gamingmesh/jobs/Signs/jobsSign.java
View File

@ -10,11 +10,13 @@ import com.gamingmesh.jobs.stuff.Util;
public class jobsSign { public class jobsSign {
private String worldName; private String worldName;
private Integer x; private Integer x;
private Integer y; private Integer y;
private Integer z; private Integer z;
private World world; private World world;
private Location loc; private Location loc;
private Integer number; private Integer number;
private String jobName; private String jobName;
private Boolean special; private Boolean special;
@ -110,21 +112,21 @@ public class jobsSign {
if (split.length > 0) if (split.length > 0)
try { try {
x = Integer.parseInt(split[1]); x = Integer.parseInt(split[1]);
} catch (Exception e) { } catch (NumberFormatException e) {
return; return;
} }
if (split.length > 1) if (split.length > 1)
try { try {
y = Integer.parseInt(split[2]); y = Integer.parseInt(split[2]);
} catch (Exception e) { } catch (NumberFormatException e) {
return; return;
} }
if (split.length > 2) if (split.length > 2)
try { try {
z = Integer.parseInt(split[3]); z = Integer.parseInt(split[3]);
} catch (Exception e) { } catch (NumberFormatException e) {
return; return;
} }

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

@ -390,8 +390,6 @@ public class LanguageManager {
c.get("command.info.output.fish.none", "%jobname% does not get money from fishing."); c.get("command.info.output.fish.none", "%jobname% does not get money from fishing.");
c.get("command.info.output.craft.info", "&eCraft"); c.get("command.info.output.craft.info", "&eCraft");
c.get("command.info.output.craft.none", "%jobname% does not get money from crafting."); c.get("command.info.output.craft.none", "%jobname% does not get money from crafting.");
c.get("command.info.output.drink.info", "&eDrink");
c.get("command.info.output.drink.none", "%jobname% does not get money for drinking.");
c.get("command.info.output.smelt.info", "&eSmelt"); c.get("command.info.output.smelt.info", "&eSmelt");
c.get("command.info.output.smelt.none", "%jobname% does not get money from smelting."); c.get("command.info.output.smelt.none", "%jobname% does not get money from smelting.");
c.get("command.info.output.brew.info", "&eBrew"); c.get("command.info.output.brew.info", "&eBrew");

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

@ -881,14 +881,12 @@ public class JobsListener implements Listener {
if (!(event.getBlock().getState() instanceof Dispenser)) if (!(event.getBlock().getState() instanceof Dispenser))
continue; continue;
Dispenser dispenser = null; Dispenser dispenser = (Dispenser) event.getBlock().getState();
BlockFace directionFacing = null; BlockFace directionFacing = null;
if (Version.isCurrentEqualOrLower(Version.v1_13_R2)) { if (Version.isCurrentEqualOrLower(Version.v1_13_R2)) {
dispenser = (Dispenser) event.getBlock().getState();
org.bukkit.material.Dispenser dis = (org.bukkit.material.Dispenser) dispenser.getData(); org.bukkit.material.Dispenser dis = (org.bukkit.material.Dispenser) dispenser.getData();
directionFacing = dis.getFacing(); directionFacing = dis.getFacing();
} else { } else {
dispenser = (Dispenser) event.getBlock().getState();
org.bukkit.block.data.type.Dispenser dis = (org.bukkit.block.data.type.Dispenser) dispenser.getBlockData(); org.bukkit.block.data.type.Dispenser dis = (org.bukkit.block.data.type.Dispenser) dispenser.getBlockData();
directionFacing = dis.getFacing(); directionFacing = dis.getFacing();
} }

11
src/main/resources/jobConfig.yml
View File

@ -243,17 +243,6 @@ Jobs:
income: 1.0 income: 1.0
points: 1.0 points: 1.0
experience: 1.0 experience: 1.0
# payment for drinking a potion
Drink:
water:
income: 0.5
experience: 2.0
regeneration_2:
income: 1.3
experience: 2.0
healing_1:
income: 1.4
experience: 2.0
# payment for breaking a block with tnt # payment for breaking a block with tnt
TNTBreak: TNTBreak:
log: log: