45 Zeilen
2.3 KiB
Diff
45 Zeilen
2.3 KiB
Diff
|
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/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
index 54399a2f2d1d86b650e27f6a31dce89035e7aeba..b7b431a649c6bc3066c267783007eee4384d27bd 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||
|
|
@@ -2852,7 +2852,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||
|
|
|
||
|
|
TileEntitySign tileentitysign = (TileEntitySign) tileentity;
|
||
|
|
|
||
|
|
- if (!tileentitysign.d() || tileentitysign.f() != this.player) {
|
||
|
|
+ if (!tileentitysign.d() || tileentitysign.signEditor == null || !tileentitysign.signEditor.equals(this.player.getUniqueID())) {
|
||
|
|
PlayerConnection.LOGGER.warn("Player {} just tried to change non-editable sign", this.player.getDisplayName().getString());
|
||
|
|
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
|
||
|
|
|
||
|
|
public TileEntitySign() {
|
||
|
|
super(TileEntityTypes.SIGN);
|
||
|
|
@@ -131,7 +132,10 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
||
|
|
}
|
||
|
|
|
||
|
|
public void a(EntityHuman entityhuman) {
|
||
|
|
- this.c = entityhuman;
|
||
|
|
+ // Paper start
|
||
|
|
+ //this.c = entityhuman;
|
||
|
|
+ signEditor = entityhuman != null ? entityhuman.getUniqueID() : null;
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
|
||
|
|
public EntityHuman f() {
|