2015-05-25 14:05:40 +02:00
|
|
|
From 9be637512105ef94ff3f673c0cae43bcb199173e Mon Sep 17 00:00:00 2001
|
2014-07-21 22:46:54 +02:00
|
|
|
From: md_5 <git@md-5.net>
|
|
|
|
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
|
2015-02-28 12:36:22 +01:00
|
|
|
index 6b02059..66e099f 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Block.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Block.java
|
2015-02-28 12:36:22 +01:00
|
|
|
@@ -309,9 +309,13 @@ public class Block {
|
2014-07-21 22:46:54 +02:00
|
|
|
return 10;
|
|
|
|
}
|
|
|
|
|
2014-11-28 02:17:45 +01:00
|
|
|
- public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {}
|
|
|
|
+ public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {
|
2014-07-21 22:46:54 +02:00
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "block onPlace"); // Spigot
|
|
|
|
+ }
|
|
|
|
|
2014-11-28 02:17:45 +01:00
|
|
|
- public void remove(World world, BlockPosition blockposition, IBlockData iblockdata) {}
|
|
|
|
+ public void remove(World world, BlockPosition blockposition, IBlockData iblockdata) {
|
2014-07-21 22:46:54 +02:00
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "block remove"); // Spigot
|
|
|
|
+ }
|
|
|
|
|
|
|
|
public int a(Random random) {
|
|
|
|
return 1;
|
2015-01-12 01:38:47 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
2015-05-09 22:23:26 +02:00
|
|
|
index 40ae494..2e81b7e 100644
|
2015-01-12 01:38:47 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
2015-02-28 12:36:22 +01:00
|
|
|
@@ -570,6 +570,7 @@ public abstract class EntityLiving extends Entity {
|
2015-01-12 01:38:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public void addEffect(MobEffect mobeffect) {
|
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "effect add"); // Spigot
|
2015-02-12 15:25:18 +01:00
|
|
|
// CraftBukkit start
|
|
|
|
if (isTickingEffects) {
|
|
|
|
effectsToProcess.add(mobeffect);
|
2014-07-21 22:46:54 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
|
2015-02-28 12:36:22 +01:00
|
|
|
index 1cc9c95..de38e80 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityTracker.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
|
2014-11-28 02:17:45 +01:00
|
|
|
@@ -94,6 +94,7 @@ public class EntityTracker {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
2015-02-28 12:36:22 +01:00
|
|
|
public void addEntity(Entity entity, int i, final int j, boolean flag) {
|
2014-07-21 22:46:54 +02:00
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "entity track"); // Spigot
|
|
|
|
if (i > this.e) {
|
|
|
|
i = this.e;
|
|
|
|
}
|
2015-02-28 12:36:22 +01:00
|
|
|
@@ -144,6 +145,7 @@ public class EntityTracker {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public void untrackEntity(Entity entity) {
|
|
|
|
+ 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
|
2015-02-28 12:36:22 +01:00
|
|
|
index 5ef2be4..8d50e05 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
2015-02-28 12:36:22 +01:00
|
|
|
@@ -310,6 +310,7 @@ public class EntityTrackerEntry {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public void updatePlayer(EntityPlayer entityplayer) {
|
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "player tracker update"); // Spigot
|
|
|
|
if (entityplayer != this.tracker) {
|
2014-11-28 02:17:45 +01:00
|
|
|
if (this.c(entityplayer)) {
|
2015-02-28 12:36:22 +01:00
|
|
|
if (!this.trackedPlayers.contains(entityplayer) && (this.e(entityplayer) || this.tracker.attachedToPlayer)) {
|
|
|
|
@@ -540,6 +541,7 @@ public class EntityTrackerEntry {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public void clear(EntityPlayer entityplayer) {
|
|
|
|
+ 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
|
2015-05-09 22:23:26 +02:00
|
|
|
index abc39f1..b4ed484 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2015-03-16 11:19:21 +01:00
|
|
|
@@ -940,6 +940,7 @@ public abstract class World implements IBlockAccess {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
|
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot
|
|
|
|
if (entity == null) return false;
|
|
|
|
// CraftBukkit end
|
2014-11-28 02:17:45 +01:00
|
|
|
int i = MathHelper.floor(entity.locX / 16.0D);
|
2015-03-16 11:19:21 +01:00
|
|
|
@@ -1047,6 +1048,7 @@ public abstract class World implements IBlockAccess {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public void removeEntity(Entity entity) {
|
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "entity remove"); // Spigot
|
|
|
|
entity.die();
|
|
|
|
if (entity instanceof EntityHuman) {
|
|
|
|
this.players.remove(entity);
|
2015-03-16 20:47:37 +01:00
|
|
|
@@ -2500,6 +2502,7 @@ public abstract class World implements IBlockAccess {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
2015-02-28 12:36:22 +01:00
|
|
|
public void b(Collection<Entity> collection) {
|
2014-07-21 22:46:54 +02:00
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "entity world add"); // Spigot
|
|
|
|
// CraftBukkit start
|
2014-11-28 02:17:45 +01:00
|
|
|
// this.entityList.addAll(collection);
|
|
|
|
Iterator iterator = collection.iterator();
|
2014-07-21 22:46:54 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2015-04-09 05:39:59 +02:00
|
|
|
index 80fc5bf..441f8a3 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2015-04-09 05:39:59 +02:00
|
|
|
@@ -166,6 +166,7 @@ public class CraftWorld implements World {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean unloadChunkRequest(int x, int z, boolean safe) {
|
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "chunk unload"); // Spigot
|
|
|
|
if (safe && isChunkInUse(x, z)) {
|
|
|
|
return false;
|
|
|
|
}
|
2015-04-09 05:39:59 +02:00
|
|
|
@@ -176,6 +177,7 @@ public class CraftWorld implements World {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
|
|
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "chunk unload"); // Spigot
|
|
|
|
if (safe && isChunkInUse(x, z)) {
|
|
|
|
return false;
|
|
|
|
}
|
2015-04-09 05:39:59 +02:00
|
|
|
@@ -243,6 +245,7 @@ public class CraftWorld implements World {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean loadChunk(int x, int z, boolean generate) {
|
|
|
|
+ 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
|
2015-05-09 22:23:26 +02:00
|
|
|
index 9396b93..fa7b91c 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2014-11-28 02:17:45 +01:00
|
|
|
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2014-07-21 22:46:54 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public void kickPlayer(String message) {
|
|
|
|
+ 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
|
2015-02-28 12:36:22 +01:00
|
|
|
index 197086e..fbea5db 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- 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() {
|
|
|
|
+ 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 + "!" );
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
--
|
2015-05-09 22:23:26 +02:00
|
|
|
2.1.4
|
2014-07-21 22:46:54 +02:00
|
|
|
|