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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-02-12 13:48:26 +00:00
parent 8a02a8d067
commit 7073c502e9
75 changed files with 299 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0010-Async-Operation-Catching.patch
View File

@@ -1,4 +1,4 @@
From 896de729f459ebbc7cfc3884e8d8de4ce2fb587e Mon Sep 17 00:00:00 2001
From 6becf979e8c6efa451679528a63a9416a44ac337 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
@@ -66,7 +66,7 @@ index 9f818cf..8052ea6 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.removeQueue.add(Integer.valueOf(this.tracker.getId()));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d90d5a4..1381660 100644
index 164d268..e26ba96 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -903,6 +903,7 @@ public abstract class World implements IBlockAccess {
@@ -85,7 +85,7 @@ index d90d5a4..1381660 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2378,6 +2380,7 @@ public abstract class World implements IBlockAccess {
@@ -2388,6 +2390,7 @@ public abstract class World implements IBlockAccess {
}
public void a(List list) {
@@ -94,7 +94,7 @@ index d90d5a4..1381660 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 c16413a..468a4e1 100644
index 965d860..57dd4e7 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 {
@@ -122,10 +122,10 @@ index c16413a..468a4e1 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 6b7fcfc..2542d56 100644
index 573f9a5..bf3c9db 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -230,6 +230,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -231,6 +231,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {
@@ -146,5 +146,5 @@ index 84091a4..2f30d66 100644
scoreboards.add(scoreboard);
return scoreboard;
--
1.8.3.2
1.8.4.msysgit.0