SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert changes to disabled plugins and scheduler.

Browse Source 
sorry for messy commit,doing via tablet on ssh
md_5

By: Hudson <hudson@mydomain.com>
This commit is contained in:
Spigot
2013-04-03 02:20:29 -05:00
parent fcfb1b5cb0
commit 08676f42a0
52 changed files with 376 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CraftBukkit-Patches/0005-Async-Operation-Catching.patch
View File

@@ -1,16 +1,16 @@
From 44708c33dfbffaf6bd135f7707780ca0bc5fdfee Mon Sep 17 00:00:00 2001
From 9ba6ff4b8b7a079bdec4c7cbe26870fe2444f562 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.
---
src/main/java/net/minecraft/server/EntityTracker.java | 2 ++
src/main/java/net/minecraft/server/EntityTrackerEntry.java | 2 ++
src/main/java/net/minecraft/server/World.java | 2 ++
src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 3 +++
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 1 +
5 files changed, 10 insertions(+)
.../java/net/minecraft/server/EntityTracker.java | 2 ++
.../net/minecraft/server/EntityTrackerEntry.java | 2 ++
src/main/java/net/minecraft/server/World.java | 2 ++
.../java/org/bukkit/craftbukkit/CraftWorld.java | 3 +++
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 1 +
5 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 4de1273..db62084 100644
@@ -33,7 +33,7 @@ index 4de1273..db62084 100644
EntityPlayer entityplayer = (EntityPlayer) entity;
Iterator iterator = this.b.iterator();
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index ae9ed52..9c014ca 100644
index 4871bd7..8aa2e88 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -286,6 +286,7 @@ public class EntityTrackerEntry {
@@ -53,7 +53,7 @@ index ae9ed52..9c014ca 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.removeQueue.add(Integer.valueOf(this.tracker.id));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0c378e7..4518acc 100644
index 78e52d4..5b8cee3 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -919,6 +919,7 @@ public abstract class World implements IBlockAccess {
@@ -73,7 +73,7 @@ index 0c378e7..4518acc 100644
if (entity instanceof EntityHuman) {
this.players.remove(entity);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a445d8f..1153eea 100644
index a303090..f5e63f8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -235,6 +235,7 @@ public class CraftWorld implements World {
@@ -101,7 +101,7 @@ index a445d8f..1153eea 100644
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 70111e7..f026c45 100644
index d37d719..0deb4df 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -213,6 +213,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -113,5 +113,5 @@ index 70111e7..f026c45 100644
getHandle().playerConnection.disconnect(message == null ? "" : message);
--
1.8.1-rc2
1.7.0.4