mirror of https://github.com/PaperMC/Paper.git
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 2ab8a1082775ea3d00bd54b6089247da9a0d6941..bd39281718199e3ce50acaec2d5f3887ab757d95 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -3195,7 +3195,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());
|