186 Zeilen
8.1 KiB
Diff
186 Zeilen
8.1 KiB
Diff
From 4465c430d6b6e15762957e595385cc4fd7e7dbc2 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 6b02059..66e099f 100644
|
|
--- a/src/main/java/net/minecraft/server/Block.java
|
|
+++ b/src/main/java/net/minecraft/server/Block.java
|
|
@@ -309,9 +309,13 @@ public class Block {
|
|
return 10;
|
|
}
|
|
|
|
- public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {}
|
|
+ public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "block onPlace"); // Spigot
|
|
+ }
|
|
|
|
- public void remove(World world, BlockPosition blockposition, IBlockData iblockdata) {}
|
|
+ public void remove(World world, BlockPosition blockposition, IBlockData iblockdata) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "block remove"); // Spigot
|
|
+ }
|
|
|
|
public int a(Random random) {
|
|
return 1;
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
index ca28b72..8125cb9 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -570,6 +570,7 @@ public abstract class EntityLiving extends Entity {
|
|
}
|
|
|
|
public void addEffect(MobEffect mobeffect) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "effect add"); // Spigot
|
|
// CraftBukkit start
|
|
if (isTickingEffects) {
|
|
effectsToProcess.add(mobeffect);
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
|
|
index 7a76dd0..e1ff4f0 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityTracker.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
|
|
@@ -94,6 +94,7 @@ public class EntityTracker {
|
|
}
|
|
|
|
public void addEntity(Entity entity, int i, final int j, boolean flag) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "entity track"); // Spigot
|
|
if (i > this.e) {
|
|
i = this.e;
|
|
}
|
|
@@ -144,6 +145,7 @@ public class EntityTracker {
|
|
}
|
|
|
|
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
|
|
index 89422ea..f0149bf 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
|
@@ -310,6 +310,7 @@ public class EntityTrackerEntry {
|
|
}
|
|
|
|
public void updatePlayer(EntityPlayer entityplayer) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "player tracker update"); // Spigot
|
|
if (entityplayer != this.tracker) {
|
|
if (this.c(entityplayer)) {
|
|
if (!this.trackedPlayers.contains(entityplayer) && (this.e(entityplayer) || this.tracker.attachedToPlayer)) {
|
|
@@ -540,6 +541,7 @@ public class EntityTrackerEntry {
|
|
}
|
|
|
|
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
|
|
index 75d335f..61db17c 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -940,6 +940,7 @@ public abstract class World implements IBlockAccess {
|
|
}
|
|
|
|
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
|
|
int i = MathHelper.floor(entity.locX / 16.0D);
|
|
@@ -1047,6 +1048,7 @@ public abstract class World implements IBlockAccess {
|
|
}
|
|
|
|
public void removeEntity(Entity entity) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "entity remove"); // Spigot
|
|
entity.die();
|
|
if (entity instanceof EntityHuman) {
|
|
this.players.remove(entity);
|
|
@@ -2491,6 +2493,7 @@ public abstract class World implements IBlockAccess {
|
|
}
|
|
|
|
public void b(Collection<Entity> collection) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "entity world add"); // Spigot
|
|
// CraftBukkit start
|
|
// this.entityList.addAll(collection);
|
|
Iterator iterator = collection.iterator();
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index e3db8e1..07d1ee4 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -167,6 +167,7 @@ public class CraftWorld implements World {
|
|
}
|
|
|
|
public boolean unloadChunkRequest(int x, int z, boolean safe) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp( "chunk unload"); // Spigot
|
|
if (safe && isChunkInUse(x, z)) {
|
|
return false;
|
|
}
|
|
@@ -177,6 +178,7 @@ public class CraftWorld implements World {
|
|
}
|
|
|
|
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;
|
|
}
|
|
@@ -244,6 +246,7 @@ public class CraftWorld implements World {
|
|
}
|
|
|
|
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
|
|
index e823f72..d4d6259 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -210,6 +210,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
|
|
@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
|
|
index 197086e..fbea5db 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() {
|
|
+ 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 + "!" );
|
|
+ }
|
|
+ }
|
|
+}
|
|
--
|
|
2.1.4
|
|
|