Update to Minecraft 1.21.4

By: md_5 <git@md-5.net>
2024-12-04 03:20:00 +11:00
parent 267ae64dd6
commit 5381ea78f7
125 changed files with 1383 additions and 1093 deletions
--- a/paper-server/nms-patches/net/minecraft/world/item/trading/IMerchant.patch
+++ b/paper-server/nms-patches/net/minecraft/world/item/trading/IMerchant.patch
@@ -1,9 +1,9 @@
 --- a/net/minecraft/world/item/trading/IMerchant.java
 +++ b/net/minecraft/world/item/trading/IMerchant.java
-@@ -52,4 +52,6 @@
-     }
- 
+@@ -54,4 +54,6 @@
     boolean isClientSide();
+ 
+     boolean stillValid(EntityHuman entityhuman);
 +
 +    org.bukkit.craftbukkit.inventory.CraftMerchant getCraftMerchant(); // CraftBukkit
 }