1 files changed, 26 insertions, 0 deletions
diff --git a/patches/server/0274-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0274-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
new file mode 100644
index 0000000000..674772b619
--- /dev/null
+++ b/patches/server/0274-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+Date: Mon, 4 Feb 2019 23:33:24 -0500
+Subject: [PATCH] Dont block Player#remove if the handle is a custom player
+
+Upstream throws UOE if you try to call remove on a Player.
+We just add a check to ensure that the CraftPlayer's handle
+is a ServerPlayer
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 2974f806ef677376ee2b53fccb6ca83151bb8451..80a9a4df9b1114f932badd847238c7a0a1a00941 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -224,8 +224,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ 
+     @Override
+     public void remove() {
++        if (this.getHandle().getClass().equals(ServerPlayer.class)) { // special case for NMS plugins inheriting
+         // Will lead to an inconsistent player state if we remove the player as any other entity.
+         throw new UnsupportedOperationException(String.format("Cannot remove player %s, use Player#kickPlayer(String) instead.", this.getName()));
++        } else {
++            super.remove();
++        }
+     }
+ 
+     @Override