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

Fix loading of per world settings

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-06-15 22:01:15 +10:00
parent 07e9933928
commit 925012dc60
10 changed files with 98 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0012-Async-Operation-Catching.patch
View File

@@ -1,4 +1,4 @@
From b99e7e04906d22b535abf86fd97b7e30616a1999 Mon Sep 17 00:00:00 2001
From a25d375917c5154237f18b2f83217133d0696919 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
@@ -46,7 +46,7 @@ index 5c03732..5f3c780 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 69799d9..b05edd1 100644
index 964bef6..9306e57 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -924,6 +924,7 @@ public abstract class World implements IBlockAccess {
@@ -74,10 +74,10 @@ index 69799d9..b05edd1 100644
Entity entity = null;
for (int i = 0; i < list.size(); ++i) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 24230de..e9dc555 100644
index d0e6d6f..d49393d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -240,6 +240,7 @@ public class CraftWorld implements World {
@@ -239,6 +239,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunkRequest(int x, int z, boolean safe) {
@@ -85,7 +85,7 @@ index 24230de..e9dc555 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -250,6 +251,7 @@ public class CraftWorld implements World {
@@ -249,6 +250,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@@ -93,7 +93,7 @@ index 24230de..e9dc555 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -317,6 +319,7 @@ public class CraftWorld implements World {
@@ -316,6 +318,7 @@ public class CraftWorld implements World {
}
public boolean loadChunk(int x, int z, boolean generate) {