Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@00ef8bd Fix Entity#isTicking and update Paper entity command (#11590)
PaperMC/Paper@6483ecb Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@17dbf74 Improve CraftEntity and CraftPlayer equals
PaperMC/Paper@0af4e84 [ci skip] Add identifying line to some larger/optimization patches
PaperMC/Paper@bcbd108 Call CraftPlayer#onEntityRemove for all online players (#11598)
PaperMC/Paper@e47f79a Configure mockito agent (#11560)
PaperMC/Paper@94ea770 Re-add exact choice shapeless support (#11546)
PaperMC/Paper@2e6eafb Improve Minecart#getMinecartMaterial (#11544)
PaperMC/Paper@9d1c91d [ci skip] Fix UseCooldownComponent jd (#11565)
PaperMC/Paper@59b79c8 Fix NPE with enchantable (#11557)
PaperMC/Paper@6da7b9e Update Eigencraft patch to 1.21.3 (#11553)
PaperMC/Paper@1ef4c0e Improve performance of RecipeMap#removeRecipe (#11547)
This commit is contained in:
granny
2024-11-09 16:57:21 -08:00
parent 74d1b4c10a
commit e2e8c6137f
28 changed files with 82 additions and 82 deletions

View File

@@ -27,7 +27,7 @@ index cf0a5943f457c532958f40b4989fa18f967abae6..2ab8ff8ca51eb841932ccca4a348acc0
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 f1834eec821a14ef6a7f42f827b7e0b8284ae5a2..e9c17953a3767e03e528ed93b10fb42626fff118 100644
index a7c3338ed6edcd26fce869ec66fdcaa4c32c0e4f..346681cf9c3c9ff5274f63236b0cc7c4eec76492 100644
--- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
@@ -234,7 +234,10 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -68,7 +68,7 @@ index f1834eec821a14ef6a7f42f827b7e0b8284ae5a2..e9c17953a3767e03e528ed93b10fb426
i2 = enchantment.getMaxLevel();
}
@@ -385,7 +394,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -384,7 +393,7 @@ public class AnvilMenu extends ItemCombinerMenu {
this.broadcastChanges();
// Purpur start - Anvil API