Fix shift click result in anvil/grindstone take result event

This commit is contained in:
BillyGalbreath
2022-07-06 14:15:51 -05:00
parent 52b42b7fd8
commit f1e3c8eb0f
5 changed files with 60 additions and 21 deletions

View File

@@ -27,10 +27,10 @@ index 7c012f1e37b0085c0939797b0dae8996b4953ab8..155b0a1aa58b891e98a55e10f112f611
++i;
} else if (targets.size() == 1) {
diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
index 10cd589e427f847936f29e33edee3923a4661210..a68dcf3ad04ef9c8e69a0d81eacfe50644463270 100644
index 800df3b7c04ce7ed52f265d681e7752f63ae4ec7..c01faa0d2900230a323c7e1f41093c691fb394aa 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -208,7 +208,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -209,7 +209,7 @@ public class AnvilMenu extends ItemCombinerMenu {
int i2 = (Integer) map1.get(enchantment);
i2 = l1 == i2 ? i2 + 1 : Math.max(i2, l1);
@@ -39,7 +39,7 @@ index 10cd589e427f847936f29e33edee3923a4661210..a68dcf3ad04ef9c8e69a0d81eacfe506
if (this.player.getAbilities().instabuild || itemstack.is(Items.ENCHANTED_BOOK)) {
flag3 = true;
@@ -220,7 +220,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -221,7 +221,7 @@ public class AnvilMenu extends ItemCombinerMenu {
Enchantment enchantment1 = (Enchantment) iterator1.next();
if (enchantment1 != enchantment && !enchantment.isCompatibleWith(enchantment1)) {
@@ -48,7 +48,7 @@ index 10cd589e427f847936f29e33edee3923a4661210..a68dcf3ad04ef9c8e69a0d81eacfe506
++i;
}
}
@@ -229,7 +229,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -230,7 +230,7 @@ public class AnvilMenu extends ItemCombinerMenu {
flag2 = true;
} else {
flag1 = true;
@@ -57,7 +57,7 @@ index 10cd589e427f847936f29e33edee3923a4661210..a68dcf3ad04ef9c8e69a0d81eacfe506
i2 = enchantment.getMaxLevel();
}
@@ -332,7 +332,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -333,7 +333,7 @@ public class AnvilMenu extends ItemCombinerMenu {
sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
this.broadcastChanges();
// Purpur start