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

Fix for combining 2 items in the same inventory

Browse Source 
Fixes #904
This commit is contained in:
montlikadani 2020-09-05 15:00:37 +02:00
parent fe66a49c56
commit 9545af4dd6
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -574,23 +574,15 @@ public class JobsPaymentListener implements Listener {
boolean leather = false;
boolean shulker = false;
ItemStack last = null;
for (ItemStack s : sourceItems) {
if (s == null)
continue;
if (!Jobs.getGCManager().payForCombiningItems && s.equals(last) &&
(CMIMaterial.isTool(s.getType()) || CMIMaterial.isArmor(s.getType())))
return;
last = s;
if (CMIMaterial.isDye(s.getType()))
DyeStack.add(s);
CMIMaterial mat = CMIMaterial.get(s);
if (mat != CMIMaterial.NONE) {
if (mat != CMIMaterial.NONE && mat != CMIMaterial.AIR) {
y++;
if (y == 0)
@ -601,7 +593,7 @@ public class JobsPaymentListener implements Listener {
third = mat;
}
switch (CMIMaterial.get(s)) {
switch (mat) {
case LEATHER_BOOTS:
case LEATHER_CHESTPLATE:
case LEATHER_HELMET:
@ -638,7 +630,11 @@ public class JobsPaymentListener implements Listener {
return;
if (y == 2 && first == second && third == second) {
Jobs.action(jPlayer, new ItemActionInfo(resultStack, ActionType.REPAIR));
if (Jobs.getGCManager().payForCombiningItems && third == first) {
Jobs.action(jPlayer, new ItemActionInfo(event.getCurrentItem(), ActionType.REPAIR));
} else {
Jobs.action(jPlayer, new ItemActionInfo(resultStack, ActionType.REPAIR));
}
return;
}