PaperMC/CraftBukkit-Patches/0010-Async-Operation-Catching.patch

139 lines
7 KiB
Diff
Raw Normal View History

2013-12-22 00:05:27 +01:00
From ced3cd552e738dec0752a8355dad90b30a73e986 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 7 Mar 2013 20:12:46 +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.
2013-08-03 11:09:09 +02:00
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
2013-12-01 05:36:32 +01:00
index ad4e3a2..c063ca1 100644
2013-08-03 11:09:09 +02:00
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
2013-12-01 04:40:53 +01:00
@@ -433,9 +433,13 @@ public class Block {
2013-08-03 11:09:09 +02:00
return 10;
}
- 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
+ }
2013-12-01 04:40:53 +01:00
- public void remove(World world, int i, int j, int k, Block block, int l) {}
2013-12-01 05:36:32 +01:00
+ public void remove(World world, int i, int j, int k, Block block, int l) {
2013-08-03 11:09:09 +02:00
+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous 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
2013-12-01 04:40:53 +01:00
index 7447e42..97d0bbb 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
2013-12-01 04:40:53 +01:00
@@ -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
2013-12-01 04:40:53 +01:00
if (i > this.e) {
i = this.e;
}
2013-12-01 04:40:53 +01:00
@@ -125,6 +126,7 @@ public class EntityTracker {
}
public void untrackEntity(Entity entity) {
+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous entity untrack!"); // Spigot
if (entity instanceof EntityPlayer) {
EntityPlayer entityplayer = (EntityPlayer) entity;
2013-12-01 04:40:53 +01:00
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
2013-12-01 04:40:53 +01:00
index 9f818cf..8052ea6 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
2013-12-01 04:40:53 +01:00
@@ -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
if (entityplayer != this.tracker) {
double d0 = entityplayer.locX - (double) (this.xLoc / 32);
double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
2013-12-01 04:40:53 +01:00
@@ -515,6 +516,7 @@ public class EntityTrackerEntry {
}
public void clear(EntityPlayer entityplayer) {
+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous player tracker clear!"); // Spigot
if (this.trackedPlayers.contains(entityplayer)) {
this.trackedPlayers.remove(entityplayer);
2013-12-01 04:40:53 +01:00
entityplayer.removeQueue.add(Integer.valueOf(this.tracker.getId()));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
2013-12-22 00:05:27 +01:00
index d90d5a4..1381660 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2013-12-09 08:00:58 +01:00
@@ -903,6 +903,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
if (entity == null) return false;
// CraftBukkit end
2013-12-09 08:00:58 +01:00
@@ -1009,6 +1010,7 @@ public abstract class World implements IBlockAccess {
}
public void removeEntity(Entity entity) {
+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous entity remove!"); // Spigot
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
2013-12-22 00:05:27 +01:00
@@ -2378,6 +2380,7 @@ public abstract class World implements IBlockAccess {
2013-05-01 08:39:55 +02:00
}
public void a(List list) {
+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous entity world add!"); // Spigot
// CraftBukkit start
2013-12-01 04:40:53 +01:00
// this.entityList.addAll(list);
2013-05-01 08:39:55 +02:00
Entity entity = null;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2013-12-22 00:05:27 +01:00
index c16413a..468a4e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2013-08-04 00:51:09 +02:00
@@ -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
if (safe && isChunkInUse(x, z)) {
return false;
}
2013-08-04 00:51:09 +02:00
@@ -169,6 +170,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous chunk unload!"); // Spigot
if (safe && isChunkInUse(x, z)) {
return false;
}
2013-08-04 00:51:09 +02:00
@@ -236,6 +238,7 @@ public class CraftWorld implements World {
}
public boolean loadChunk(int x, int z, boolean generate) {
+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous 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
2013-12-22 00:05:27 +01:00
index 83f51ab..ef74879 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2013-12-01 04:40:53 +01:00
@@ -230,6 +230,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2013-12-01 04:40:53 +01:00
@Override
public void kickPlayer(String message) {
+ if (Thread.currentThread() != MinecraftServer.getServer().primaryThread) throw new IllegalStateException("Asynchronous player kick!"); // Spigot
if (getHandle().playerConnection == null) return;
getHandle().playerConnection.disconnect(message == null ? "" : message);
--
2013-12-01 04:40:53 +01:00
1.8.3.2