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

Upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-24 16:27:12 +10:00
parent a8030addd9
commit b56d35552d
78 changed files with 483 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 728c17c2a96cb836ffe6a3449454cb8d4173753b Mon Sep 17 00:00:00 2001
From 34d6b850d27725d6934a91a92645e7de92370b58 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@@ -66,10 +66,10 @@ index c148c4d..a2b54a4 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.d(this.tracker);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b7aed63..1ec7267 100644
index 61610f6..1031066 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -886,6 +886,7 @@ public abstract class World implements IBlockAccess {
@@ -976,6 +976,7 @@ public abstract class World implements IBlockAccess {
}
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@@ -77,7 +77,7 @@ index b7aed63..1ec7267 100644
if (entity == null) return false;
// CraftBukkit end
@@ -992,6 +993,7 @@ public abstract class World implements IBlockAccess {
@@ -1082,6 +1083,7 @@ public abstract class World implements IBlockAccess {
}
public void removeEntity(Entity entity) {
@@ -85,7 +85,7 @@ index b7aed63..1ec7267 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2376,6 +2378,7 @@ public abstract class World implements IBlockAccess {
@@ -2466,6 +2468,7 @@ public abstract class World implements IBlockAccess {
}
public void a(List list) {
@@ -94,10 +94,10 @@ index b7aed63..1ec7267 100644
// this.entityList.addAll(list);
Entity entity = null;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a97e330..1f26312 100644
index c7c6a6f..452f6f3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -159,6 +159,7 @@ public class CraftWorld implements World {
@@ -162,6 +162,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunkRequest(int x, int z, boolean safe) {
@@ -105,7 +105,7 @@ index a97e330..1f26312 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -169,6 +170,7 @@ public class CraftWorld implements World {
@@ -172,6 +173,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@@ -113,7 +113,7 @@ index a97e330..1f26312 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -236,6 +238,7 @@ public class CraftWorld implements World {
@@ -239,6 +241,7 @@ public class CraftWorld implements World {
}
public boolean loadChunk(int x, int z, boolean generate) {