@@ -5,22 +5,14 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
5
5
6
6
7
7
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8
- index e4d54fdc28b6161e74626f25299b1081e6605e98..3ab4ecb9ee3586cab04da7b500024855892faa3e 100644
8
+ index e4d54fdc28b6161e74626f25299b1081e6605e98..7eeb9b5482ed7933c42cdd84936460e93585c584 100644
9
9
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
10
10
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
11
- @@ -1,5 +1,6 @@
12
- package net.minecraft.server.network;
13
-
14
- + import com.destroystokyo.paper.event.player.IllegalPacketEvent;
15
- import com.google.common.collect.Lists;
16
- import com.google.common.primitives.Floats;
17
- import com.mojang.brigadier.ParseResults;
18
- @@ -2994,8 +2995,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
11
+ @@ -2994,7 +2994,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
19
12
20
13
if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot
21
14
BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
22
15
- BlockEntity tileentity = this.player.level.getBlockEntity(blockposition);
23
- -
24
16
+ // Paper start
25
17
+ BlockEntity tileentity = null;
26
18
+ if (this.player.getLevel().isLoadedAndInBounds(blockposition)) {
@@ -32,6 +24,6 @@ index e4d54fdc28b6161e74626f25299b1081e6605e98..3ab4ecb9ee3586cab04da7b500024855
32
24
+ nbttagcompound.remove("z");
33
25
+ }
34
26
+ // Paper end
27
+
35
28
if (tileentity != null) {
36
29
tileentity.saveToItem(itemstack);
37
- }
0 commit comments