diff options
| author | Shane Freeder <[email protected]> | 2022-04-13 09:15:28 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2022-04-13 09:15:28 +0100 |
| commit | d4a712d957804a01eae35f3a970c134f69938731 (patch) | |
| tree | a7b19576b7617ca24834dfaf6ae46ee5b7d86730 | |
| parent | a9ee1046a50d6ca53b056fa5ef5a0bbb1206964f (diff) | |
| download | Paper-d4a712d957804a01eae35f3a970c134f69938731.tar.gz Paper-d4a712d957804a01eae35f3a970c134f69938731.zip | |
[CI-SKIP] Remove unused import from last patch
| -rw-r--r-- | patches/server/0892-Prevent-tile-entity-copies-loading-chunks.patch | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/patches/server/0892-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0892-Prevent-tile-entity-copies-loading-chunks.patch index 8e36eb5cca..0e613adbc2 100644 --- a/patches/server/0892-Prevent-tile-entity-copies-loading-chunks.patch +++ b/patches/server/0892-Prevent-tile-entity-copies-loading-chunks.patch @@ -5,22 +5,14 @@ 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 e4d54fdc28b6161e74626f25299b1081e6605e98..3ab4ecb9ee3586cab04da7b500024855892faa3e 100644 +index e4d54fdc28b6161e74626f25299b1081e6605e98..7eeb9b5482ed7933c42cdd84936460e93585c584 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1,5 +1,6 @@ - package net.minecraft.server.network; - -+import com.destroystokyo.paper.event.player.IllegalPacketEvent; - import com.google.common.collect.Lists; - import com.google.common.primitives.Floats; - import com.mojang.brigadier.ParseResults; -@@ -2994,8 +2995,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -2994,7 +2994,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound); - BlockEntity tileentity = this.player.level.getBlockEntity(blockposition); -- + // Paper start + BlockEntity tileentity = null; + if (this.player.getLevel().isLoadedAndInBounds(blockposition)) { @@ -32,6 +24,6 @@ index e4d54fdc28b6161e74626f25299b1081e6605e98..3ab4ecb9ee3586cab04da7b500024855 + nbttagcompound.remove("z"); + } + // Paper end + if (tileentity != null) { tileentity.saveToItem(itemstack); - } |