Paper/Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch

45 lines
2.3 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2019-02-28 06:47:57 +01: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/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index a2413a4e1d16b856df9f74e42eb141f72b0893c6..593609ff38b01ae35e17dd65bf101e38d080dc3a 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -2838,7 +2838,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
2019-02-28 06:47:57 +01:00
TileEntitySign tileentitysign = (TileEntitySign) tileentity;
2019-05-28 01:01:45 +02:00
- if (!tileentitysign.d() || tileentitysign.f() != this.player) {
+ if (!tileentitysign.d() || tileentitysign.signEditor == null || !tileentitysign.signEditor.equals(this.player.getUniqueID())) {
2020-06-25 16:09:55 +02:00
PlayerConnection.LOGGER.warn("Player {} just tried to change non-editable sign", this.player.getDisplayName().getString());
2019-02-28 06:47:57 +01:00
this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
return;
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntitySign.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntitySign.java
index ec550aaa4e7943af4ecdd2275f1f32c21edf770a..6d0fe58d7e574ce5189e1f7a8485060d60b466d9 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntitySign.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntitySign.java
@@ -30,6 +30,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
private EntityHuman c;
private final FormattedString[] g;
private EnumColor color;
+ public java.util.UUID signEditor; // Paper
2019-02-28 06:47:57 +01:00
public TileEntitySign() {
super(TileEntityTypes.SIGN);
@@ -131,7 +132,10 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
2019-02-28 06:47:57 +01:00
}
public void a(EntityHuman entityhuman) {
- this.c = entityhuman;
2019-02-28 06:47:57 +01:00
+ // Paper start
+ //this.c = entityhuman;
2019-02-28 06:47:57 +01:00
+ signEditor = entityhuman != null ? entityhuman.getUniqueID() : null;
+ // Paper end
}
2019-05-28 01:01:45 +02:00
public EntityHuman f() {