2020-05-06 09:48:49 +00:00
|
|
|
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-08-25 02:22:08 +00:00
|
|
|
index 071826eb4def7e2a09659b078da5c636b6929476..8f22e0ec85d48b65dab20f1db70944fca3bf28e6 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-08-25 02:22:08 +00:00
|
|
|
@@ -2582,7 +2582,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-08-25 02:22:08 +00:00
|
|
|
index 2b249e7e2018a283b80b9462fbc129420e47ec06..7bee21d9ae9e8c27fe129605060455b55093afda 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 { //
|
2020-02-11 04:35:46 +00:00
|
|
|
private EntityHuman c;
|
2020-08-25 02:22:08 +00:00
|
|
|
private final FormattedString[] g;
|
2020-02-11 04:35:46 +00:00
|
|
|
private EnumColor color;
|
|
|
|
+ public java.util.UUID signEditor; // Paper
|
2019-02-28 05:47:57 +00:00
|
|
|
|
|
|
|
public TileEntitySign() {
|
2020-02-11 04:35:46 +00:00
|
|
|
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) {
|
2019-12-12 16:20:43 +00:00
|
|
|
- this.c = entityhuman;
|
2019-02-28 05:47:57 +00:00
|
|
|
+ // Paper start
|
2019-12-12 16:20:43 +00:00
|
|
|
+ //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() {
|