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

Merge tweaks

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-06-20 18:41:59 +10:00
parent d3c3596a4c
commit a2f8e62aed
3 changed files with 89 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 10ca32f973eaccc4eab615b966b195c90555c916 Mon Sep 17 00:00:00 2001
From a8c529d46c95e00dc30e16fec26a5af608e2db78 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,10 +46,10 @@ 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 a0c61a1..1afc717 100644
index d7e5301..e353caa 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 {
@@ -926,6 +926,7 @@ public abstract class World implements IBlockAccess {
}
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@@ -57,7 +57,7 @@ index a0c61a1..1afc717 100644
if (entity == null) return false;
// CraftBukkit end
@@ -1030,6 +1031,7 @@ public abstract class World implements IBlockAccess {
@@ -1032,6 +1033,7 @@ public abstract class World implements IBlockAccess {
}
public void removeEntity(Entity entity) {
@@ -65,7 +65,7 @@ index a0c61a1..1afc717 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2447,6 +2449,7 @@ public abstract class World implements IBlockAccess {
@@ -2449,6 +2451,7 @@ public abstract class World implements IBlockAccess {
}
public void a(List list) {
@@ -74,10 +74,10 @@ index a0c61a1..1afc717 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 d0e6d6f..d49393d 100644
index c0fb528..edc59b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -239,6 +239,7 @@ public class CraftWorld implements World {
@@ -160,6 +160,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunkRequest(int x, int z, boolean safe) {
@@ -85,7 +85,7 @@ index d0e6d6f..d49393d 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -249,6 +250,7 @@ public class CraftWorld implements World {
@@ -170,6 +171,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@@ -93,7 +93,7 @@ index d0e6d6f..d49393d 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -316,6 +318,7 @@ public class CraftWorld implements World {
@@ -237,6 +239,7 @@ public class CraftWorld implements World {
}
public boolean loadChunk(int x, int z, boolean generate) {