34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zach Brown <zach@zachbr.io>
|
||
|
|
Date: Mon, 4 Feb 2019 23:33:24 -0500
|
||
|
|
Subject: [PATCH] Block Entity#remove from being called on Players
|
||
|
|
|
||
|
|
This doesn't result in the same behavior as other entities and causes
|
||
|
|
several problems. Anyone ever complain about the "Cannot send chat
|
||
|
|
message" thing? That's one of the issues this causes, among others.
|
||
|
|
|
||
|
|
If a plugin developer can come up with a valid reason to call this on a
|
||
|
|
Player we will look at limiting the scope of this change. It appears to
|
||
|
|
be unintentional in the few cases we've seen so far.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
index 25e0d0dd7b114560896679f0314cea288d7a768c..f57ad014fb3d2ce2405bdd63db4c730458aac17a 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -2234,6 +2234,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
public void resetCooldown() {
|
||
|
|
getHandle().resetAttackCooldown();
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public void remove() {
|
||
|
|
+ if (this.getHandle().getClass().equals(EntityPlayer.class)) { // special case for NMS plugins inheriting
|
||
|
|
+ throw new UnsupportedOperationException("Calling Entity#remove on players produces undefined (bad) behavior");
|
||
|
|
+ } else {
|
||
|
|
+ super.remove();
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
// Spigot start
|