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, 24 insertions, 0 deletions

diff --git a/patches/server/0694-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0694-Prevent-tile-entity-copies-loading-chunks.patch
new file mode 100644
index 0000000000..aaf851bff7
--- /dev/null
+++ b/patches/server/0694-Prevent-tile-entity-copies-loading-chunks.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Wed, 13 Apr 2022 08:25:42 +0100
+Subject: [PATCH] Prevent tile entity copies loading chunks
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index c4ce2f6a2737891337a4369deee5d98f990edeab..d2eb455eb527ca819565e6538f97d1972afc8a7f 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3202,7 +3202,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+                 BlockPos blockposition = BlockEntity.getPosFromTag(customdata.getUnsafe());
+ 
+                 if (this.player.level().isLoaded(blockposition)) {
+-                    BlockEntity tileentity = this.player.level().getBlockEntity(blockposition);
++                    // Paper start - Prevent tile entity copies loading chunks
++                    BlockEntity tileentity = null;
++                    if (this.player.distanceToSqr(blockposition.getX(), blockposition.getY(), blockposition.getZ()) < 32 * 32 && this.player.serverLevel().isLoadedAndInBounds(blockposition)) {
++                        tileentity = this.player.level().getBlockEntity(blockposition);
++                    }
++                    // Paper end - Prevent tile entity copies loading chunks
+ 
+                     if (tileentity != null) {
+                         tileentity.saveToItem(itemstack, this.player.level().registryAccess());