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

[Cosmetic] Update patches to be generated with latest stable git.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-10 12:36:11 +10:00
parent c35e70ad7d
commit b8055fe033
45 changed files with 337 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,16 @@
From 9ba6ff4b8b7a079bdec4c7cbe26870fe2444f562 Mon Sep 17 00:00:00 2001
From b2dfa37cd8758766e20a5060df024e6eff41ec39 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.
---
.../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(-)
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(+)
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 4de1273..db62084 100644
@@ -53,7 +53,7 @@ index 4871bd7..8aa2e88 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 78e52d4..5b8cee3 100644
index 3d77400..92e8a37 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 {
@@ -101,10 +101,10 @@ index a303090..f5e63f8 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 d37d719..0deb4df 100644
index a93625c..5b74a5b 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 {
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void kickPlayer(String message) {
@@ -113,5 +113,5 @@ index d37d719..0deb4df 100644
getHandle().playerConnection.disconnect(message == null ? "" : message);
--
1.7.0.4
1.8.2.1