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

48 Zeilen
2.1 KiB
Diff

From f0ae31c519bfef05b81bac120398101448cbe471 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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4b3ddfd990..2c94ca6a8e 100644
2019-02-28 06:47:57 +01:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2546,7 +2546,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())) {
2019-02-28 06:47:57 +01: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
index 03f6ddf000..a934020190 100644
2019-02-28 06:47:57 +01:00
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -10,6 +10,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
private EntityHuman c;
private final String[] g = new String[4];
private EnumColor color;
+ public java.util.UUID signEditor; // Paper
2019-02-28 06:47:57 +01:00
public TileEntitySign() {
super(TileEntityTypes.SIGN);
@@ -108,7 +109,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() {
2019-02-28 06:47:57 +01:00
--
2.26.2
2019-02-28 06:47:57 +01:00