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

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-03 18:45:50 +10:00
parent 5ed5fdbdc3
commit 19214d1353
15 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From d44ba655f20564580bf309ee402fb17e04224152 Mon Sep 17 00:00:00 2001
From 02576518418792080a11f4f648156fb819ae1c72 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
@@ -26,7 +26,7 @@ index 1d9203b..ebbef6a 100644
EntityPlayer entityplayer = (EntityPlayer) entity;
Iterator iterator = this.b.iterator();
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 2a9dd2c..8c35cfe 100644
index 43fcba0..ce4e2ee 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -297,6 +297,7 @@ public class EntityTrackerEntry {
@@ -37,7 +37,7 @@ index 2a9dd2c..8c35cfe 100644
if (entityplayer != this.tracker) {
double d0 = entityplayer.locX - (double) (this.xLoc / 32);
double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
@@ -503,6 +504,7 @@ public class EntityTrackerEntry {
@@ -507,6 +508,7 @@ public class EntityTrackerEntry {
}
public void clear(EntityPlayer entityplayer) {
@@ -102,7 +102,7 @@ index 8881878..e8bb8ae 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 25deaa9..360d45c 100644
index 3e42b91..6e9834f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -218,6 +218,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {