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

45 lines
2.3 KiB
Diff
Raw Normal View History

2019-02-28 00:47:57 -05:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
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
2019-07-19 21:01:24 -07:00
index 4a1565f4f7..6030766099 100644
2019-02-28 00:47:57 -05:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-05-05 10:19:34 -07:00
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn {
2019-02-28 00:47:57 -05:00
TileEntitySign tileentitysign = (TileEntitySign) tileentity;
2019-05-27 16:01:45 -07:00
- if (!tileentitysign.d() || tileentitysign.f() != this.player) {
+ if (!tileentitysign.d() || tileentitysign.signEditor == null || !tileentitysign.signEditor.equals(this.player.getUniqueID())) {
2019-02-28 00:47:57 -05:00
this.minecraftServer.warning("Player " + this.player.getDisplayName().getString() + " just tried to change non-editable sign");
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
2019-07-19 21:01:24 -07:00
index 1b01792730..c7aa3b350a 100644
2019-02-28 00:47:57 -05:00
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
2019-05-05 10:19:34 -07:00
@@ -0,0 +0,0 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
// Paper start - Strip invalid unicode from signs on load
2019-02-28 00:47:57 -05:00
private static final boolean keepInvalidUnicode = Boolean.getBoolean("Paper.keepInvalidUnicode"); // Allow people to keep their bad unicode if they really want it
private boolean privateUnicodeRemoved = false;
+ public java.util.UUID signEditor;
// Paper end
public TileEntitySign() {
2019-05-05 10:19:34 -07:00
@@ -0,0 +0,0 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
2019-02-28 00:47:57 -05:00
}
public void a(EntityHuman entityhuman) {
2019-05-05 10:19:34 -07:00
- this.j = entityhuman;
2019-02-28 00:47:57 -05:00
+ // Paper start
+ //this.g = entityhuman;
+ signEditor = entityhuman != null ? entityhuman.getUniqueID() : null;
+ // Paper end
}
2019-05-27 16:01:45 -07:00
public EntityHuman f() {
2019-02-28 00:47:57 -05:00
--