Update to Minecraft 1.17.1

By: md_5 <git@md-5.net>
2021-07-07 00:00:00 +10:00
parent 0392f45e9c
commit e8c9836ec9
59 changed files with 428 additions and 492 deletions
--- a/paper-server/nms-patches/net/minecraft/world/inventory/ContainerMerchant.patch
+++ b/paper-server/nms-patches/net/minecraft/world/inventory/ContainerMerchant.patch
@@ -40,7 +40,7 @@
@@ -154,7 +170,7 @@
     }
 
-     private void o() {
+     private void r() {
 -        if (!this.trader.getWorld().isClientSide) {
 +        if (!this.trader.getWorld().isClientSide && this.trader instanceof Entity) { // CraftBukkit - SPIGOT-5035
             Entity entity = (Entity) this.trader;