From 5164642604ab20f599f15b6d1ab0f6076700330b Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:11:22 +1100 Subject: [PATCH] Remove async op catcher to its own class --- .../0010-Async-Operation-Catching.patch | 73 ++++++++++++------- .../0022-Entity-Tracking-Ranges.patch | 6 +- 2 files changed, 51 insertions(+), 28 deletions(-) diff --git a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch index 4648867248..2c7135de2f 100644 --- a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch @@ -1,12 +1,12 @@ -From ddf36039c168fa7bc9a3453246096353cf3bd7e8 Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Thu, 7 Mar 2013 20:12:46 +1100 +From 3b727c9b92712a9855872ffa16704ad161ce375a Mon Sep 17 00:00:00 2001 +From: md_5 +Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread. diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 51f8279..cbd6f1d 100644 +index 51f8279..aaead32 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -433,9 +433,13 @@ public class Block { @@ -15,25 +15,25 @@ index 51f8279..cbd6f1d 100644 - public void onPlace(World world, int i, int j, int k) {} + public void onPlace(World world, int i, int j, int k) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous block onPlace!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "block onPlace"); // Spigot + } - public void remove(World world, int i, int j, int k, Block block, int l) {} + public void remove(World world, int i, int j, int k, Block block, int l) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous block remove!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "block remove"); // Spigot + } public int a(Random random) { return 1; diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index af440b9..b169df4 100644 +index af440b9..8f291c2 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -91,6 +91,7 @@ public class EntityTracker { } public void addEntity(Entity entity, int i, int j, boolean flag) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous entity track!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "entity track"); // Spigot if (i > this.e) { i = this.e; } @@ -41,19 +41,19 @@ index af440b9..b169df4 100644 } public void untrackEntity(Entity entity) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous entity untrack!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "entity untrack"); // Spigot if (entity instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) entity; Iterator iterator = this.c.iterator(); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index c148c4d..cd52d7c 100644 +index c148c4d..a2b54a4 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -299,6 +299,7 @@ public class EntityTrackerEntry { } public void updatePlayer(EntityPlayer entityplayer) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous player tracker update!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "player tracker update"); // Spigot if (entityplayer != this.tracker) { double d0 = entityplayer.locX - (double) (this.xLoc / 32); double d1 = entityplayer.locZ - (double) (this.zLoc / 32); @@ -61,19 +61,19 @@ index c148c4d..cd52d7c 100644 } public void clear(EntityPlayer entityplayer) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous player tracker clear!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "player tracker clear"); // Spigot if (this.trackedPlayers.contains(entityplayer)) { this.trackedPlayers.remove(entityplayer); entityplayer.d(this.tracker); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d023889..1ed1e27 100644 +index d023889..19654b4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -900,6 +900,7 @@ public abstract class World implements IBlockAccess { } public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous entity add!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot if (entity == null) return false; // CraftBukkit end @@ -81,7 +81,7 @@ index d023889..1ed1e27 100644 } public void removeEntity(Entity entity) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous entity remove!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "entity remove"); // Spigot entity.die(); if (entity instanceof EntityHuman) { this.players.remove(entity); @@ -89,19 +89,19 @@ index d023889..1ed1e27 100644 } public void a(List list) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous entity world add!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "entity world add"); // Spigot // CraftBukkit start // this.entityList.addAll(list); Entity entity = null; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d9fbd00..89cc715 100644 +index d9fbd00..bfa8c23 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -159,6 +159,7 @@ public class CraftWorld implements World { } public boolean unloadChunkRequest(int x, int z, boolean safe) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous chunk unload!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "chunk unload"); // Spigot if (safe && isChunkInUse(x, z)) { return false; } @@ -109,7 +109,7 @@ index d9fbd00..89cc715 100644 } public boolean unloadChunk(int x, int z, boolean save, boolean safe) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous chunk unload!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "chunk unload"); // Spigot if (safe && isChunkInUse(x, z)) { return false; } @@ -117,34 +117,57 @@ index d9fbd00..89cc715 100644 } public boolean loadChunk(int x, int z, boolean generate) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous chunk load!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "chunk load"); // Spigot chunkLoadCount++; if (generate) { // Use the default variant of loadChunk when generate == true. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b045cb9..07c8a2c 100644 +index b045cb9..b03037a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -231,6 +231,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void kickPlayer(String message) { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous player kick!"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "player kick"); // Spigot if (getHandle().playerConnection == null) return; getHandle().playerConnection.disconnect(message == null ? "" : message); diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java -index 84091a4..2f30d66 100644 +index 84091a4..a8f28d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -42,6 +42,7 @@ public final class CraftScoreboardManager implements ScoreboardManager { } public CraftScoreboard getNewScoreboard() { -+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous scoreboard creation"); // Spigot ++ org.spigotmc.AsyncCatcher.catchOp( "scoreboard creation"); // Spigot CraftScoreboard scoreboard = new CraftScoreboard(new ScoreboardServer(server)); scoreboards.add(scoreboard); return scoreboard; +diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java +new file mode 100644 +index 0000000..4b3aa85 +--- /dev/null ++++ b/src/main/java/org/spigotmc/AsyncCatcher.java +@@ -0,0 +1,17 @@ ++package org.spigotmc; ++ ++import net.minecraft.server.MinecraftServer; ++ ++public class AsyncCatcher ++{ ++ ++ public static boolean enabled = true; ++ ++ public static void catchOp(String reason) ++ { ++ if ( enabled && Thread.currentThread() != MinecraftServer.getServer().primaryThread ) ++ { ++ throw new IllegalStateException( "Asynchronous " + reason + "!" ); ++ } ++ } ++} -- -1.8.5.2.msysgit.0 +1.8.3.2 diff --git a/CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch index d958cc147a..85f4540920 100644 --- a/CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0022-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 8b7fcf347ebe03ae3ed45d5335bff52a713c0022 Mon Sep 17 00:00:00 2001 +From 8d41e5457f9da0d496a143c12e550a9e542a7214 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -12,13 +12,13 @@ This has multiple benefits: 4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames. diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 97d0bbb..fc679ae 100644 +index 8f291c2..52a45da 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -92,6 +92,7 @@ public class EntityTracker { public void addEntity(Entity entity, int i, int j, boolean flag) { - if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous entity track!"); // Spigot + org.spigotmc.AsyncCatcher.catchOp( "entity track"); // Spigot + i = org.spigotmc.TrackingRange.getEntityTrackingRange(entity, i); // Spigot if (i > this.e) { i = this.e;