diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-11 10:44:51 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-11 10:44:51 +0000 |
| commit | 7a30c3117e058ab82ad9721a1abc6500bb02cbd2 (patch) | |
| tree | 976a0f0fede9d9208f5e23e33c3a8b1bf2d07dbe | |
| parent | 20ef9f5676c3c2790c96e8ec4b835c9a7e2149ef (diff) | |
| download | craftbukkit-7a30c3117e058ab82ad9721a1abc6500bb02cbd2.tar craftbukkit-7a30c3117e058ab82ad9721a1abc6500bb02cbd2.tar.gz craftbukkit-7a30c3117e058ab82ad9721a1abc6500bb02cbd2.tar.lz craftbukkit-7a30c3117e058ab82ad9721a1abc6500bb02cbd2.tar.xz craftbukkit-7a30c3117e058ab82ad9721a1abc6500bb02cbd2.zip | |
Don't run tasks when the server is stopping
| -rw-r--r-- | nms-patches/MinecraftServer.patch | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/nms-patches/MinecraftServer.patch b/nms-patches/MinecraftServer.patch index 1c0f94ad..2a647207 100644 --- a/nms-patches/MinecraftServer.patch +++ b/nms-patches/MinecraftServer.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/MinecraftServer.java 2015-03-08 10:08:09.275589093 +0000 -+++ src/main/java/net/minecraft/server/MinecraftServer.java 2015-03-08 10:08:09.279589093 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/MinecraftServer.java 2015-03-11 10:44:42.911576345 +0000 ++++ src/main/java/net/minecraft/server/MinecraftServer.java 2015-03-11 10:44:42.915576345 +0000 @@ -38,14 +38,27 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -678,3 +678,12 @@ } public void a(CommandObjectiveExecutor.EnumCommandResult commandobjectiveexecutor_enumcommandresult, int i) {} +@@ -1180,7 +1411,7 @@ + + public <V> ListenableFuture<V> a(Callable<V> callable) { + Validate.notNull(callable); +- if (!this.isMainThread() && !this.isStopped()) { ++ if (!this.isMainThread()) { // CraftBukkit && !this.isStopped()) { + ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callable); + Queue queue = this.j; + |