Remove bad server.scheduleOnMain disconnect calls from old patches

The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point

1 files changed, 302 insertions, 0 deletions

diff --git a/patches/server/0891-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0891-Add-missing-InventoryHolders-to-inventories.patch
new file mode 100644
index 0000000000..ae956d4693
--- /dev/null
+++ b/patches/server/0891-Add-missing-InventoryHolders-to-inventories.patch
@@ -0,0 +1,302 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Mon, 24 Jan 2022 00:09:02 -0800
+Subject: [PATCH] Add missing InventoryHolders to inventories
+
+
+diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
+index db41ffbd24adccd78edf3368ba1f7a3ab9f6072c..5db5ba026462ca642dcee718af732f80fadabef5 100644
+--- a/src/main/java/net/minecraft/world/Container.java
++++ b/src/main/java/net/minecraft/world/Container.java
+@@ -103,7 +103,7 @@ public interface Container extends Clearable {
+ 
+     java.util.List<org.bukkit.entity.HumanEntity> getViewers();
+ 
+-    org.bukkit.inventory.InventoryHolder getOwner();
++    [email protected] InventoryHolder getOwner(); // Paper - annotation
+ 
+     void setMaxStackSize(int size);
+ 
+diff --git a/src/main/java/net/minecraft/world/SimpleContainer.java b/src/main/java/net/minecraft/world/SimpleContainer.java
+index 6632cf24ebe6d147950a1fdb876660937da86b73..d04bf7d06855022c973073fb84c5d3d65f2553e1 100644
+--- a/src/main/java/net/minecraft/world/SimpleContainer.java
++++ b/src/main/java/net/minecraft/world/SimpleContainer.java
+@@ -30,7 +30,7 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+     // CraftBukkit start - add fields and methods
+     public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+     private int maxStack = MAX_STACK;
+-    protected org.bukkit.inventory.InventoryHolder bukkitOwner;
++    protected @Nullable org.bukkit.inventory.InventoryHolder bukkitOwner; // Paper - annotation
+ 
+     public List<ItemStack> getContents() {
+         return this.items;
+@@ -58,6 +58,11 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+     }
+ 
+     public org.bukkit.inventory.InventoryHolder getOwner() {
++        // Paper start - Add missing InventoryHolders
++        if (this.bukkitOwner == null && this.bukkitOwnerCreator != null) {
++            this.bukkitOwner = this.bukkitOwnerCreator.get();
++        }
++        // Paper end - Add missing InventoryHolders
+         return this.bukkitOwner;
+     }
+ 
+@@ -86,6 +91,13 @@ public class SimpleContainer implements Container, StackedContentsCompatible {
+     public SimpleContainer(int size) {
+         this(size, null);
+     }
++    // Paper start - Add missing InventoryHolders
++    private @Nullable java.util.function.Supplier<? extends org.bukkit.inventory.InventoryHolder> bukkitOwnerCreator;
++    public SimpleContainer(java.util.function.Supplier<? extends org.bukkit.inventory.InventoryHolder> bukkitOwnerCreator, int size) {
++        this(size);
++        this.bukkitOwnerCreator = bukkitOwnerCreator;
++    }
++    // Paper end - Add missing InventoryHolders
+ 
+     public SimpleContainer(int i, org.bukkit.inventory.InventoryHolder owner) {
+         this.bukkitOwner = owner;
+diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
+index 428e454116804c27496cfbf796edd44780890d33..4c7e91977fa590abfe7eb3704d8008ed6d4e3ab3 100644
+--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
+@@ -991,4 +991,15 @@ public abstract class AbstractContainerMenu {
+         this.stateId = this.stateId + 1 & 32767;
+         return this.stateId;
+     }
++
++    // Paper start - Add missing InventoryHolders
++    // The reason this is a supplier, is that the createHolder method uses the bukkit InventoryView#getTopInventory to get the inventory in question
++    // and that can't be obtained safely until the AbstractContainerMenu has been fully constructed. Using a supplier lazily
++    // initializes the InventoryHolder safely.
++    protected final Supplier<org.bukkit.inventory.BlockInventoryHolder> createBlockHolder(final ContainerLevelAccess context) {
++        //noinspection ConstantValue
++        Preconditions.checkArgument(context != null, "context was null");
++        return () -> context.createBlockHolder(this);
++    }
++    // Paper end - Add missing InventoryHolders
+ }
+diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
+index 1b6fd16d8c6195c6f7b65c7621d5f9bd15c46a75..7f513e8c4f81524aee9326ddbbc6bec0b3fa1b27 100644
+--- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
+@@ -42,7 +42,7 @@ public class BeaconMenu extends AbstractContainerMenu {
+     public BeaconMenu(int syncId, Container inventory, ContainerData propertyDelegate, ContainerLevelAccess context) {
+         super(MenuType.BEACON, syncId);
+         this.player = (Inventory) inventory; // CraftBukkit - TODO: check this
+-        this.beacon = new SimpleContainer(1) { // CraftBukkit - decompile error
++        this.beacon = new SimpleContainer(this.createBlockHolder(context), 1) { // CraftBukkit - decompile error // Paper - Add missing InventoryHolders
+             @Override
+             public boolean canPlaceItem(int slot, ItemStack stack) {
+                 return stack.is(ItemTags.BEACON_PAYMENT_ITEMS);
+diff --git a/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java b/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
+index c52c4c4210bc6ae082443318d9795c48c816aba6..ab98637bf967ac19f0bc06e8cb7f18a8b13ec809 100644
+--- a/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
+@@ -54,7 +54,7 @@ public class CartographyTableMenu extends AbstractContainerMenu {
+ 
+     public CartographyTableMenu(int syncId, Inventory inventory, final ContainerLevelAccess context) {
+         super(MenuType.CARTOGRAPHY_TABLE, syncId);
+-        this.container = new SimpleContainer(2) {
++        this.container = new SimpleContainer(this.createBlockHolder(context), 2) { // Paper - Add missing InventoryHolders
+             @Override
+             public void setChanged() {
+                 CartographyTableMenu.this.slotsChanged(this);
+@@ -68,7 +68,7 @@ public class CartographyTableMenu extends AbstractContainerMenu {
+             }
+             // CraftBukkit end
+         };
+-        this.resultContainer = new ResultContainer() {
++        this.resultContainer = new ResultContainer(this.createBlockHolder(context)) { // Paper - Add missing InventoryHolders
+             @Override
+             public void setChanged() {
+                 CartographyTableMenu.this.slotsChanged(this);
+diff --git a/src/main/java/net/minecraft/world/inventory/ContainerLevelAccess.java b/src/main/java/net/minecraft/world/inventory/ContainerLevelAccess.java
+index 85e336637db8643fc5aca1dba724c9b341cbf46f..12b466ccb7c36021cf807c4f3fd2bcb037943abc 100644
+--- a/src/main/java/net/minecraft/world/inventory/ContainerLevelAccess.java
++++ b/src/main/java/net/minecraft/world/inventory/ContainerLevelAccess.java
+@@ -21,6 +21,18 @@ public interface ContainerLevelAccess {
+         return new org.bukkit.Location(this.getWorld().getWorld(), this.getPosition().getX(), this.getPosition().getY(), this.getPosition().getZ());
+     }
+     // CraftBukkit end
++    // Paper start - Add missing InventoryHolders
++    default boolean isBlock() {
++        return false;
++    }
++
++    default [email protected] BlockInventoryHolder createBlockHolder(AbstractContainerMenu menu) {
++        if (!this.isBlock()) {
++            return null;
++        }
++        return new org.bukkit.craftbukkit.inventory.CraftBlockInventoryHolder(this, menu.getBukkitView().getTopInventory());
++    }
++    // Paper end - Add missing InventoryHolders
+ 
+     ContainerLevelAccess NULL = new ContainerLevelAccess() {
+         @Override
+@@ -48,6 +60,12 @@ public interface ContainerLevelAccess {
+                 return pos;
+             }
+             // CraftBukkit end
++            // Paper start - Add missing InventoryHolders
++            @Override
++            public boolean isBlock() {
++                return true;
++            }
++            // Paper end - Add missing InventoryHolders
+ 
+             @Override
+             public <T> Optional<T> evaluate(BiFunction<Level, BlockPos, T> getter) {
+diff --git a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
+index 6f88ce0076460215f5c1a965aa2bd7050071b611..c1b9c3ad2cccfa520e9d73b786142624ac5f3380 100644
+--- a/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/EnchantmentMenu.java
+@@ -66,7 +66,7 @@ public class EnchantmentMenu extends AbstractContainerMenu {
+ 
+     public EnchantmentMenu(int syncId, Inventory playerInventory, ContainerLevelAccess context) {
+         super(MenuType.ENCHANTMENT, syncId);
+-        this.enchantSlots = new SimpleContainer(2) {
++        this.enchantSlots = new SimpleContainer(this.createBlockHolder(context), 2) { // Paper - Add missing InventoryHolders
+             @Override
+             public void setChanged() {
+                 super.setChanged();
+diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+index 15ec798e149d80aace186f84b9236ddeaba690c3..1678f6c8b2c7db761783e53043169bf12bc2cb29 100644
+--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
+@@ -60,8 +60,8 @@ public class GrindstoneMenu extends AbstractContainerMenu {
+ 
+     public GrindstoneMenu(int syncId, Inventory playerInventory, final ContainerLevelAccess context) {
+         super(MenuType.GRINDSTONE, syncId);
+-        this.resultSlots = new ResultContainer();
+-        this.repairSlots = new SimpleContainer(2) {
++        this.resultSlots = new ResultContainer(this.createBlockHolder(context)); // Paper - Add missing InventoryHolders
++        this.repairSlots = new SimpleContainer(this.createBlockHolder(context), 2) { // Paper - Add missing InventoryHolders
+             @Override
+             public void setChanged() {
+                 super.setChanged();
+diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
+index be840717e180b6b5abd14db6cc9263349737f9a3..7de5e47f9a54263734eeef855a2dc07ef64d30ea 100644
+--- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
+@@ -18,7 +18,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
+     protected final Player player;
+     protected final Container inputSlots;
+     private final List<Integer> inputSlotIndexes;
+-    protected final ResultContainer resultSlots = new ResultContainer();
++    protected final ResultContainer resultSlots; // Paper - Add missing InventoryHolders; delay field init
+     private final int resultSlotIndex;
+ 
+     protected abstract boolean mayPickup(Player player, boolean present);
+@@ -30,6 +30,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
+     public ItemCombinerMenu(@Nullable MenuType<?> type, int syncId, Inventory playerInventory, ContainerLevelAccess context) {
+         super(type, syncId);
+         this.access = context;
++        this.resultSlots = new ResultContainer(this.createBlockHolder(this.access)); // Paper - Add missing InventoryHolders; delay field init
+         this.player = playerInventory.player;
+         ItemCombinerMenuSlotDefinition itemcombinermenuslotdefinition = this.createInputSlotDefinitions();
+ 
+@@ -96,7 +97,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
+     protected abstract ItemCombinerMenuSlotDefinition createInputSlotDefinitions();
+ 
+     private SimpleContainer createContainer(int size) {
+-        return new SimpleContainer(size) {
++        return new SimpleContainer(this.createBlockHolder(this.access), size) { // Paper - Add missing InventoryHolders
+             @Override
+             public void setChanged() {
+                 super.setChanged();
+diff --git a/src/main/java/net/minecraft/world/inventory/LoomMenu.java b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
+index 72ad78659a373213ed1f37498754adaf18f1f68b..4f3f6ea43030853bd9df067358a1f4d16c40e6d4 100644
+--- a/src/main/java/net/minecraft/world/inventory/LoomMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
+@@ -73,7 +73,7 @@ public class LoomMenu extends AbstractContainerMenu {
+         this.selectablePatterns = List.of();
+         this.slotUpdateListener = () -> {
+         };
+-        this.inputContainer = new SimpleContainer(3) {
++        this.inputContainer = new SimpleContainer(this.createBlockHolder(context), 3) { // Paper - Add missing InventoryHolders
+             @Override
+             public void setChanged() {
+                 super.setChanged();
+@@ -88,7 +88,7 @@ public class LoomMenu extends AbstractContainerMenu {
+             }
+             // CraftBukkit end
+         };
+-        this.outputContainer = new SimpleContainer(1) {
++        this.outputContainer = new SimpleContainer(this.createBlockHolder(context), 1) { // Paper - Add missing InventoryHolders
+             @Override
+             public void setChanged() {
+                 super.setChanged();
+diff --git a/src/main/java/net/minecraft/world/inventory/ResultContainer.java b/src/main/java/net/minecraft/world/inventory/ResultContainer.java
+index d4592218d761eb38402e3d95c642e80a708cb333..4c4266a85c38e41e6c7e6144a68624f4daa50c54 100644
+--- a/src/main/java/net/minecraft/world/inventory/ResultContainer.java
++++ b/src/main/java/net/minecraft/world/inventory/ResultContainer.java
+@@ -29,7 +29,12 @@ public class ResultContainer implements Container, RecipeCraftingHolder {
+     }
+ 
+     public org.bukkit.inventory.InventoryHolder getOwner() {
+-        return null; // Result slots don't get an owner
++        // Paper start - Add missing InventoryHolders
++        if (this.holder == null && this.holderCreator != null) {
++            this.holder = this.holderCreator.get();
++        }
++        return this.holder; // Result slots don't get an owner
++        // Paper end - Add missing InventoryHolders
+     }
+ 
+     // Don't need a transaction; the InventoryCrafting keeps track of it for us
+@@ -53,6 +58,14 @@ public class ResultContainer implements Container, RecipeCraftingHolder {
+         return null;
+     }
+     // CraftBukkit end
++    // Paper start - Add missing InventoryHolders
++    private @Nullable java.util.function.Supplier<? extends org.bukkit.inventory.InventoryHolder> holderCreator;
++    private @Nullable org.bukkit.inventory.InventoryHolder holder;
++    public ResultContainer(java.util.function.Supplier<? extends org.bukkit.inventory.InventoryHolder> holderCreator) {
++        this();
++        this.holderCreator = holderCreator;
++    }
++    // Paper end - Add missing InventoryHolders
+ 
+     public ResultContainer() {
+         this.itemStacks = NonNullList.withSize(1, ItemStack.EMPTY);
+diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
+index 977ccef3c9fa7685209f3eca894a3b69501ebcc1..5ddae1afab0a68465ea60395c84b0997ee994f88 100644
+--- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
+@@ -69,7 +69,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
+         this.input = ItemStack.EMPTY;
+         this.slotUpdateListener = () -> {
+         };
+-        this.container = new SimpleContainer(1) {
++        this.container = new SimpleContainer(this.createBlockHolder(context), 1) { // Paper - Add missing InventoryHolders
+             @Override
+             public void setChanged() {
+                 super.setChanged();
+@@ -84,7 +84,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
+             }
+             // CraftBukkit end
+         };
+-        this.resultContainer = new ResultContainer();
++        this.resultContainer = new ResultContainer(this.createBlockHolder(context)); // Paper - Add missing InventoryHolders
+         this.access = context;
+         this.level = playerInventory.player.level();
+         this.inputSlot = this.addSlot(new Slot(this.container, 0, 20, 33));
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftBlockInventoryHolder.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftBlockInventoryHolder.java
+index 7ae484b0fa5bf5494c6ead15f7f1c0fa840ae270..7129eb5f5cea39992b4c690cb421004004a952ea 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftBlockInventoryHolder.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftBlockInventoryHolder.java
+@@ -17,6 +17,13 @@ public class CraftBlockInventoryHolder implements BlockInventoryHolder {
+         this.block = CraftBlock.at(world, pos);
+         this.inventory = new CraftInventory(inv);
+     }
++    // Paper start - Add missing InventoryHolders
++    public CraftBlockInventoryHolder(net.minecraft.world.inventory.ContainerLevelAccess levelAccess, Inventory inventory) {
++        com.google.common.base.Preconditions.checkArgument(levelAccess.isBlock());
++        this.block = CraftBlock.at(levelAccess.getWorld(), levelAccess.getPosition());
++        this.inventory = inventory;
++    }
++    // Paper end - Add missing InventoryHolders
+ 
+     @Override
+     public Block getBlock() {