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

Should probably do an upstream update.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-24 19:29:30 +10:00
parent 75ed907450
commit caa031dbae
15 changed files with 55 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From a7ffffafca73803554e56ab978d6b1334a58969a Mon Sep 17 00:00:00 2001
From c03134ec78557b243c61be2550a093a349ddfcd5 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,10 +26,10 @@ index a8e45dd..7f23f71 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 673c204..b14e1e0 100644
index e05296c..dc251dd 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -292,6 +292,7 @@ public class EntityTrackerEntry {
@@ -297,6 +297,7 @@ public class EntityTrackerEntry {
}
public void updatePlayer(EntityPlayer entityplayer) {
@@ -37,7 +37,7 @@ index 673c204..b14e1e0 100644
if (entityplayer != this.tracker) {
double d0 = entityplayer.locX - (double) (this.xLoc / 32);
double d1 = entityplayer.locZ - (double) (this.zLoc / 32);
@@ -501,6 +502,7 @@ public class EntityTrackerEntry {
@@ -511,6 +512,7 @@ public class EntityTrackerEntry {
}
public void clear(EntityPlayer entityplayer) {
@@ -102,10 +102,10 @@ 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 5628d84..5bf0e3c 100644
index 25deaa9..360d45c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -218,6 +218,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void kickPlayer(String message) {