mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
70ce6ce831
This makes it easier for downstream projects (forks) to replace the version fetching system with their own. It is as simple as implementing an interface and overriding the default implementation of org.bukkit.UnsafeValues#getVersionFetcher() It also makes it easier for us to organize things like the version history feature. Lastly I have updated the paper implementation to check against the site API rather than against jenkins.
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From ffa6d841ac14b1b378e3a19fe391af3344c50e0d 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 367e8cfc1..c020d0b4e 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1953,6 +1953,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.21.0
|
|
|