Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 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
-@@ -53,4 +53,6 @@
-         }
- 
+@@ -52,4 +52,6 @@
     }
+ 
+     boolean isClientSide();
 +
 +    org.bukkit.craftbukkit.inventory.CraftMerchant getCraftMerchant(); // CraftBukkit
 }