From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown 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 9df9b465df75dd41eabd789e85ee841ed4be092c..9cae7d8a77af303cb509c23efd5541a5e04f54a6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -247,8 +247,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