mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-21 03:43:27 +02:00
2f34301581
Upstream has released updates that appears 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: 7361a62e SPIGOT-5641: Add Block.getDrops(ItemStack, Entity) 1dc91b15 Add specific notes about what is not API 2b05ef88 #484: Allow statistics to be accessed for offline players CraftBukkit Changes:f7d6ad53SPIGOT-5603: Use LootContext#lootingModifier in CraftLootTable5838285dSPIGOT-5657: BlockPlaceEvent not cancelling for tripwire hooksf325b9beSPIGOT-5641: Add Block.getDrops(ItemStack, Entity)e25a2272Fix some formatting in CraftHumanEntity498540e0Add Merchant slot delegateb2de47d5SPIGOT-5621: Add missing container types for opening InventoryViewaa3a2f27#645: Allow statistics to be accessed for offline players2122c0b1#649: CraftBell should implement Bell
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 27539df92037f2eecee6e1d40e45bace83eb5c6c 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 21aaacc13d..344e9e9b48 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1950,6 +1950,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
public void resetCooldown() {
|
|
getHandle().resetCooldown();
|
|
}
|
|
+
|
|
+ @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
|
|
--
|
|
2.25.1
|
|
|