testserver/Spigot-Server-Patches/0334-Fix-sign-edit-memory-l...

45 lines
2.2 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2019-02-28 05:47:57 +00:00
From: Aikar <aikar@aikar.co>
Date: Thu, 28 Feb 2019 00:15:28 -0500
Subject: [PATCH] Fix sign edit memory leak
when a player edits a sign, a reference to their Entity is never cleand up.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2020-06-25 14:09:55 +00:00
index 782cfec6247d52a0e3aa12f21247f3aab1bb3c47..76d67b6b0afa590e7e0f838aa7abb4efadfda045 100644
2019-02-28 05:47:57 +00:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2020-06-25 14:09:55 +00:00
@@ -2586,7 +2586,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
2019-02-28 05:47:57 +00:00
TileEntitySign tileentitysign = (TileEntitySign) tileentity;
2019-05-27 23:01:45 +00:00
- if (!tileentitysign.d() || tileentitysign.f() != this.player) {
+ if (!tileentitysign.d() || tileentitysign.signEditor == null || !tileentitysign.signEditor.equals(this.player.getUniqueID())) {
2020-06-25 14:09:55 +00:00
PlayerConnection.LOGGER.warn("Player {} just tried to change non-editable sign", this.player.getDisplayName().getString());
2019-02-28 05:47:57 +00:00
this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
return;
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
2020-06-25 14:09:55 +00:00
index 8e77c662f7d970d8ff86f6c5b9bccc598442594d..2746cb4d4950b303f4d6b4822223d26b51ebe5a4 100644
2019-02-28 05:47:57 +00:00
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
2020-06-25 14:09:55 +00:00
@@ -11,6 +11,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
private EntityHuman c;
2020-06-25 14:09:55 +00:00
private final IChatFormatted[] g;
private EnumColor color;
+ public java.util.UUID signEditor; // Paper
2019-02-28 05:47:57 +00:00
public TileEntitySign() {
super(TileEntityTypes.SIGN);
2020-06-25 14:09:55 +00:00
@@ -112,7 +113,10 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
2019-02-28 05:47:57 +00:00
}
public void a(EntityHuman entityhuman) {
- this.c = entityhuman;
2019-02-28 05:47:57 +00:00
+ // Paper start
+ //this.c = entityhuman;
2019-02-28 05:47:57 +00:00
+ signEditor = entityhuman != null ? entityhuman.getUniqueID() : null;
+ // Paper end
}
2019-05-27 23:01:45 +00:00
public EntityHuman f() {