Update to latest upstream

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-05-04 09:24:15 +10:00
parent d8b3cd4a33
commit 326c461585
25 changed files with 74 additions and 479 deletions

View File

@@ -1,4 +1,4 @@
From 2e912ff97691c86ff0778304e3428423b57fc266 Mon Sep 17 00:00:00 2001
From becc64aca459c1337bc4499542847edd3921a542 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 319170a..69ef160 100644
index b339688..3f9c453 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -918,6 +918,7 @@ public abstract class World implements IBlockAccess {
@@ -65,7 +65,7 @@ index 319170a..69ef160 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2440,6 +2442,7 @@ public abstract class World implements IBlockAccess {
@@ -2449,6 +2451,7 @@ public abstract class World implements IBlockAccess {
}
public void a(List list) {