Update to Minecraft 1.21.2

By: md_5 <git@md-5.net>
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions
--- a/paper-server/nms-patches/net/minecraft/world/inventory/ContainerMerchant.patch
+++ b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerMerchant.patch
@@ -34,10 +34,10 @@
         this.addSlot(new Slot(this.tradeContainer, 1, 162, 37));
         this.addSlot(new SlotMerchantResult(playerinventory.player, imerchant, this.tradeContainer, 2, 220, 37));
 +        this.player = playerinventory; // CraftBukkit - save player
+         this.addStandardInventorySlots(playerinventory, 108, 84);
+     }
 
-         int j;
- 
-@@ -155,7 +171,7 @@
+@@ -143,7 +159,7 @@
     }
 
     private void playTradeSound() {