aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch')
-rw-r--r--Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
index 457aa012d7..7aeae21ef8 100644
--- a/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From d94378d518cda98be6fc17c01200ed86b7ac3790 Mon Sep 17 00:00:00 2001
+From e66b45a8fc4d658d70b3faff1ab27165f4c7e879 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Thu, 3 Mar 2016 01:17:12 -0600
Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
that it is happening so that plugin authors can fix their code to stop executing commands async.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e19513a96..fd2c0c4f2 100644
+index 27283efad..57879c76d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1267,6 +1267,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1268,6 +1268,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
if (!async && s.startsWith("/")) {
@@ -48,7 +48,7 @@ index e19513a96..fd2c0c4f2 100644
} else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.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 30ed3ad58..a795a165a 100644
+index 0f77d0674..5302bb283 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -647,6 +647,29 @@ public final class CraftServer implements Server {
@@ -82,5 +82,5 @@ index 30ed3ad58..a795a165a 100644
return true;
}
--
-2.12.0.windows.1
+2.12.2.windows.2