Update to Minecraft 1.21.2

By: md_5 <git@md-5.net>

paper-server/nms-patches/net/minecraft/world/inventory/Container.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/inventory/Container.java
 +++ b/net/minecraft/world/inventory/Container.java
-@@ -33,6 +33,20 @@
+@@ -35,6 +35,20 @@
  import net.minecraft.world.level.block.entity.TileEntity;
  import org.slf4j.Logger;
  
@@ -21,7 +21,7 @@
  public abstract class Container {
  
      private static final Logger LOGGER = LogUtils.getLogger();
-@@ -63,6 +77,27 @@
+@@ -67,6 +81,27 @@
      private ContainerSynchronizer synchronizer;
      private boolean suppressRemoteUpdates;
  
@@ -49,7 +49,7 @@
      protected Container(@Nullable Containers<?> containers, int i) {
          this.carried = ItemStack.EMPTY;
          this.remoteSlots = NonNullList.create();
-@@ -164,6 +199,15 @@
+@@ -192,6 +227,15 @@
  
      }
  
@@ -65,7 +65,7 @@
      public void removeSlotListener(ICrafting icrafting) {
          this.containerListeners.remove(icrafting);
      }
-@@ -380,7 +424,7 @@
+@@ -417,7 +461,7 @@
                  }
              } else if (this.quickcraftStatus == 2) {
                  if (!this.quickcraftSlots.isEmpty()) {
@@ -74,7 +74,7 @@
                          k = ((Slot) this.quickcraftSlots.iterator().next()).index;
                          this.resetQuickCraft();
                          this.doClick(k, this.quickcraftType, InventoryClickType.PICKUP, entityhuman);
-@@ -396,6 +440,7 @@
+@@ -433,6 +477,7 @@
                      l = this.getCarried().getCount();
                      Iterator iterator = this.quickcraftSlots.iterator();
  
@@ -82,7 +82,7 @@
                      while (iterator.hasNext()) {
                          Slot slot1 = (Slot) iterator.next();
                          ItemStack itemstack2 = this.getCarried();
-@@ -406,12 +451,48 @@
+@@ -443,12 +488,48 @@
                              int l1 = Math.min(getQuickCraftPlaceCount(this.quickcraftSlots, this.quickcraftType, itemstack1) + j1, k1);
  
                              l -= l1 - j1;
@@ -134,7 +134,7 @@
                  }
  
                  this.resetQuickCraft();
-@@ -429,8 +510,11 @@
+@@ -466,8 +547,11 @@
                  if (i == -999) {
                      if (!this.getCarried().isEmpty()) {
                          if (clickaction == ClickAction.PRIMARY) {
@@ -147,7 +147,7 @@
                          } else {
                              entityhuman.drop(this.getCarried().split(1), true);
                          }
-@@ -493,6 +577,15 @@
+@@ -530,6 +614,15 @@
                      }
  
                      slot.setChanged();
@@ -163,23 +163,18 @@
                  }
              } else {
                  int j2;
-@@ -609,13 +702,14 @@
+@@ -662,8 +755,9 @@
              ItemStack itemstack = this.getCarried();
  
              if (!itemstack.isEmpty()) {
 +                this.setCarried(ItemStack.EMPTY); // CraftBukkit - SPIGOT-4556 - from below
-                 if (entityhuman.isAlive() && !((EntityPlayer) entityhuman).hasDisconnected()) {
-                     entityhuman.getInventory().placeItemBackInInventory(itemstack);
-                 } else {
-                     entityhuman.drop(itemstack, false);
-                 }
- 
+                 dropOrPlaceInInventory(entityhuman, itemstack);
 -                this.setCarried(ItemStack.EMPTY);
 +                // this.setCarried(ItemStack.EMPTY); // CraftBukkit - moved up
              }
-         }
  
-@@ -830,6 +924,11 @@
+         }
+@@ -893,6 +987,11 @@
      }
  
      public ItemStack getCarried() {