mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 03:48:01 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
25 lines
1.6 KiB
Diff
25 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
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 9656e15aa15735e9bd6ac4e2ad7aa8aa66140b9a..bc8f9bd50de3894e6262e13ed55252c98f22ed8a 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -3245,7 +3245,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());
|