Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 14:06:17 +01:00
Code Issues Projects Releases Wiki Activity

[CI-SKIP] Remove unused import from last patch

Browse Source
This commit is contained in:
Shane Freeder 2022-04-13 09:15:28 +01:00
parent a9ee1046a5
commit d4a712d957
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0892-Prevent-tile-entity-copies-loading-chunks.patch
View File

@ -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 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 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1,5 +1,6 @@ @@ -2994,7 +2994,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
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
if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot 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); BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound);
- BlockEntity tileentity = this.player.level.getBlockEntity(blockposition); - BlockEntity tileentity = this.player.level.getBlockEntity(blockposition);
-
+ // Paper start + // Paper start
+ BlockEntity tileentity = null; + BlockEntity tileentity = null;
+ if (this.player.getLevel().isLoadedAndInBounds(blockposition)) { + if (this.player.getLevel().isLoadedAndInBounds(blockposition)) {
@ -32,6 +24,6 @@ index e4d54fdc28b6161e74626f25299b1081e6605e98..3ab4ecb9ee3586cab04da7b500024855
+ nbttagcompound.remove("z"); + nbttagcompound.remove("z");
+ } + }
+ // Paper end + // Paper end
if (tileentity != null) { if (tileentity != null) {
tileentity.saveToItem(itemstack); tileentity.saveToItem(itemstack);
}