geforkt von Mirrors/Paper
9df2066642
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: dfe1fb48 PR-906: Add missing MinecraftExperimental annotation to Bundles 825ab30d PR-905: Add missing MapCursor.Type and update documentation e03d10e6 PR-903: Make BARRIER Waterlogged 1961ead6 PR-898: Use Java Consumer instead of Bukkit Consumer CraftBukkit Changes: f71a799f0 Make BARRIER Waterlogged 172f76a45 Upgrade specialsource-maven-plugin f0702775c SPIGOT-7486: Alternate approach to null profile names 069495671 SPIGOT-7485: Allow air entity items since required for Vanilla logic 5dfd33dc2 SPIGOT-7484: Cancelling PlayerEditBookEvent does not update client's book contents 02d490788 PR-1250: Standardize and centralize Bukkit / Minecraft registry conversion 9024a09b9 PR-1251: Use Java Consumer instead of Bukkit Consumer 6d4b25bf1 Increase diff stability
34 Zeilen
1.6 KiB
Diff
34 Zeilen
1.6 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 d939e5385d250095674c1f0c6f4209cdf87ad7cb..94cb3513aeef549da3626ff18c1ea0662252ecb9 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2890,6 +2890,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
public void resetCooldown() {
|
|
getHandle().resetAttackStrengthTicker();
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public void remove() {
|
|
+ if (this.getHandle().getClass().equals(ServerPlayer.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
|
|
private final Player.Spigot spigot = new Player.Spigot()
|