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

More upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-19 09:15:23 +10:00
parent 1752ff24d2
commit f8ca6ed867
136 changed files with 348 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From dbc3fd4cf4f7f6b1b81f6cd416844b93802e1de1 Mon Sep 17 00:00:00 2001
From 728c17c2a96cb836ffe6a3449454cb8d4173753b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@@ -66,10 +66,10 @@ index c148c4d..a2b54a4 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.d(this.tracker);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index edf229b..146285f 100644
index b7aed63..1ec7267 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -901,6 +901,7 @@ public abstract class World implements IBlockAccess {
@@ -886,6 +886,7 @@ public abstract class World implements IBlockAccess {
}
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@@ -77,7 +77,7 @@ index edf229b..146285f 100644
if (entity == null) return false;
// CraftBukkit end
@@ -1007,6 +1008,7 @@ public abstract class World implements IBlockAccess {
@@ -992,6 +993,7 @@ public abstract class World implements IBlockAccess {
}
public void removeEntity(Entity entity) {
@@ -85,7 +85,7 @@ index edf229b..146285f 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2391,6 +2393,7 @@ public abstract class World implements IBlockAccess {
@@ -2376,6 +2378,7 @@ public abstract class World implements IBlockAccess {
}
public void a(List list) {
@@ -94,7 +94,7 @@ index edf229b..146285f 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 d9fbd00..bfa8c23 100644
index a97e330..1f26312 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,7 +122,7 @@ index d9fbd00..bfa8c23 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 716cf70..d6bfa0d 100644
index dea26e0..fd1c137 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -238,6 +238,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -169,5 +169,5 @@ index 0000000..4b3aa85
+ }
+}
--
1.8.3.2
1.9.1