From dd358f1352826d70d3813f70090d6e1e3e308208 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Fri, 11 Jun 2021 19:10:28 +1000 Subject: [PATCH] SPIGOT-6506: Fix crash with custom inventories By: md_5 --- .../net/minecraft/world/inventory/Container.patch | 9 +++++++++ .../org/bukkit/craftbukkit/inventory/CraftContainer.java | 1 + 2 files changed, 10 insertions(+) diff --git a/paper-server/nms-patches/net/minecraft/world/inventory/Container.patch b/paper-server/nms-patches/net/minecraft/world/inventory/Container.patch index 2c42bc1c09..609bf9a849 100644 --- a/paper-server/nms-patches/net/minecraft/world/inventory/Container.patch +++ b/paper-server/nms-patches/net/minecraft/world/inventory/Container.patch @@ -21,6 +21,15 @@ public abstract class Container { public static final int SLOT_CLICKED_OUTSIDE = -999; +@@ -43,7 +57,7 @@ + public NonNullList slots = NonNullList.a(); + private final List dataSlots = Lists.newArrayList(); + private ItemStack carried; +- private final NonNullList remoteSlots; ++ public NonNullList remoteSlots; + private final IntList remoteDataSlots; + private ItemStack remoteCarried; + @Nullable @@ -57,6 +71,27 @@ private ContainerSynchronizer synchronizer; private boolean suppressRemoteUpdates; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java index 59d927c45e..d50ed0f491 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java @@ -223,6 +223,7 @@ public class CraftContainer extends Container { if (delegate != null) { this.lastSlots = delegate.lastSlots; this.slots = delegate.slots; + this.remoteSlots = delegate.remoteSlots; } // SPIGOT-4598 - we should still delegate the shift click handler