From 74575d48885b6e04cec82d85456b57389bd3ff56 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 11 Jun 2021 19:10:28 +1000
Subject: [PATCH] SPIGOT-6506: Fix crash with custom inventories

---
 .../net/minecraft/world/inventory/Container.patch        | 9 +++++++++
 .../org/bukkit/craftbukkit/inventory/CraftContainer.java | 1 +
 2 files changed, 10 insertions(+)

diff --git a/nms-patches/net/minecraft/world/inventory/Container.patch b/nms-patches/net/minecraft/world/inventory/Container.patch
index 2c42bc1c0..609bf9a84 100644
--- a/nms-patches/net/minecraft/world/inventory/Container.patch
+++ b/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<Slot> slots = NonNullList.a();
+     private final List<ContainerProperty> dataSlots = Lists.newArrayList();
+     private ItemStack carried;
+-    private final NonNullList<ItemStack> remoteSlots;
++    public NonNullList<ItemStack> remoteSlots;
+     private final IntList remoteDataSlots;
+     private ItemStack remoteCarried;
+     @Nullable
 @@ -57,6 +71,27 @@
      private ContainerSynchronizer synchronizer;
      private boolean suppressRemoteUpdates;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index 59d927c45..d50ed0f49 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/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