Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)
This commit is contained in:
parent
6178609e1d
commit
ae6fec6d13
240 changed files with 435 additions and 456 deletions
|
@ -74,10 +74,10 @@ index 301042e7a0d372a914f27ec0988dd938cf2a8262..1766a22e65af2e08611a9435c7384377
|
|||
this.connection.send(new ClientboundDisconnectPacket(chatmessage));
|
||||
this.connection.disconnect(chatmessage);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index af05f2fe686fbdd52f7e536e7f14e96b157de6ca..134f9efd6267c3baeabc110f75d7182b0f78fa77 100644
|
||||
index 6c8b907b3c2f9e9a5cbae38620d6ebbd70eaf453..fc9c24e20bcdb43d79cb44bfbc2c0e82e8d1db46 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -997,6 +997,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1018,6 +1018,7 @@ public final class CraftServer implements Server {
|
||||
plugin.getDescription().getFullName(),
|
||||
"This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin"
|
||||
));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue