Updated Upstream (Bukkit/CraftBukkit) (#6638)
This commit is contained in:
parent
e8830b27e3
commit
cc38c16e75
97 changed files with 335 additions and 562 deletions
|
@ -48,10 +48,10 @@ index da9f4b3337b49597c17b50964656457cd629a0b7..22c2c121bbcc7b0e15d73d20c9cc83d5
|
|||
} else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
|
||||
// Do nothing, this is coming from a plugin
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 66420a9b1e917856b94343b90859323a1d84341f..022326790d61d163a47b2fe888627f0625405755 100644
|
||||
index adcb4244c70ec9acfa0815ec88a148ade095b378..0ea239d2ba64b062af89d0462eb4be5c9e60a421 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -773,6 +773,28 @@ public final class CraftServer implements Server {
|
||||
@@ -776,6 +776,28 @@ public final class CraftServer implements Server {
|
||||
Validate.notNull(commandLine, "CommandLine cannot be null");
|
||||
org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue