SteamWar/Paper
11
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-04 08:51:09 +10:00
parent 4d8ae2cd25
commit eb9d70ade9
11 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 11dc47b80c3d35e079fabff8953334708d3cf798 Mon Sep 17 00:00:00 2001
From dafcb9453f2b6debf6e9613b3a402a85f28e654a 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 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 43fcba0..ce4e2ee 100644
index 8545b50..1f5a652 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 {
@@ -57,7 +57,7 @@ index 43fcba0..ce4e2ee 100644
if (entityplayer != this.tracker) {
double d0 = entityplayer.locX - (double) (this.xLoc / 32);
double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
@@ -507,6 +508,7 @@ public class EntityTrackerEntry {
@@ -513,6 +514,7 @@ public class EntityTrackerEntry {
}
public void clear(EntityPlayer entityplayer) {
@@ -94,10 +94,10 @@ index 0968ed8..4ec4d08 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 8881878..e8bb8ae 100644
index fc71833..7601fb5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -160,6 +160,7 @@ public class CraftWorld implements World {
@@ -159,6 +159,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunkRequest(int x, int z, boolean safe) {
@@ -105,7 +105,7 @@ index 8881878..e8bb8ae 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -170,6 +171,7 @@ public class CraftWorld implements World {
@@ -169,6 +170,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@@ -113,7 +113,7 @@ index 8881878..e8bb8ae 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -237,6 +239,7 @@ public class CraftWorld implements World {
@@ -236,6 +238,7 @@ public class CraftWorld implements World {
}
public boolean loadChunk(int x, int z, boolean generate) {
@@ -122,7 +122,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 3e42b91..6e9834f 100644
index 3cf0c28..988c6e7 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 {