Upstream Merge

Bukkit

@@ -1 +1 @@
-Subproject commit 02f2b5e2907ec978bd35c4d410e5f5aec1bb9587
+Subproject commit bf832ee9d60b348f0b003631c411c5f3fe23226c

CraftBukkit

@@ -1 +1 @@
-Subproject commit 3b7c805621236a7386a9ffb38d907ee059caf845
+Subproject commit 5af5f5df2581d478828fc77e0f8672f749ebb7a9

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,14 +1,14 @@
-From 880a779913939ebd2e21755be3251bf62e40ae7a Mon Sep 17 00:00:00 2001
+From b2fceb79c1539564a17de3eb86d2fb7be3f3c385 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 75b1fb2..8881878 100644
+index e8315dd..fc71833 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1265,4 +1265,14 @@ public class CraftWorld implements World {
+@@ -1267,4 +1267,14 @@ public class CraftWorld implements World {
              cps.queueUnload(chunk.x, chunk.z);
          }
      }
@@ -44,10 +44,10 @@ index b46b9c4..a386001 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 8e2e5cd..b1f86a0 100644
+index d9659fb..4f4b84f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -397,4 +397,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -398,4 +398,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
  
          return getHandle().vehicle.getBukkitEntity();
      }

CraftBukkit-Patches/0012-Async-Operation-Catching.patch

@@ -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 {

CraftBukkit-Patches/0019-Fix-Mob-Spawning-Relative-to-View-Distance.patch

@@ -1,4 +1,4 @@
-From 038cd29b823c4fdf31ec4113960ae56fcd895bc7 Mon Sep 17 00:00:00 2001
+From 774f4afb154aafc002d1bd87843b2cafafeea32f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@@ -135,7 +135,7 @@ index 9812538..ecf13aa 100644
                                                                      continue label110;
                                                                  }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index f74fc9b..f0becc1 100644
+index bab9d8f..9f95452 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -154,4 +154,11 @@ public class SpigotWorldConfig
@@ -151,4 +151,5 @@ index f74fc9b..f0becc1 100644
 +    }
  }
 -- 
-1.8.1.msysgit.1
+1.8.1.2
+

CraftBukkit-Patches/0039-Particle-API.patch

@@ -1,4 +1,4 @@
-From aba117a1c6cc8fa223c803c82e879f83cc4ae828 Mon Sep 17 00:00:00 2001
+From b23f908193514fa253e4c41dc3db750f66f2f7ec Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 16:14:30 +1000
 Subject: [PATCH] Particle API
@@ -43,10 +43,10 @@ index 7de0de5..7eca388 100644
              datavalue = 0;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e8bb8ae..a68169f 100644
+index 7601fb5..6d22e82 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -766,31 +766,21 @@ public class CraftWorld implements World {
+@@ -765,31 +765,21 @@ public class CraftWorld implements World {
          } else {
              Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
          }
@@ -88,7 +88,7 @@ index e8bb8ae..a68169f 100644
      public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
          return spawn(location, clazz, SpawnReason.CUSTOM);
      }
-@@ -1271,6 +1261,62 @@ public class CraftWorld implements World {
+@@ -1273,6 +1263,62 @@ public class CraftWorld implements World {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {

CraftBukkit-Patches/0042-Implement-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From aed8f98426fff44dfbe86e4cf0b3aa106cabbd13 Mon Sep 17 00:00:00 2001
+From 5007d731040f3c02b189a979c40c961f27e3e16b Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:37 -0500
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -63,10 +63,10 @@ index 108b375..4edd5e3 100644
  
          return entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6db7b9b..8cea95c 100644
+index cccfe75..d8f56e9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -35,6 +35,7 @@ import org.bukkit.Material;
+@@ -35,6 +35,7 @@ import org.bukkit.Server;
  import org.bukkit.block.Block;
  import org.bukkit.block.BlockFace;
  import org.bukkit.block.BlockState;
@@ -74,7 +74,7 @@ index 6db7b9b..8cea95c 100644
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.CraftWorld;
  import org.bukkit.craftbukkit.block.CraftBlock;
-@@ -117,6 +118,22 @@ public class CraftEventFactory {
+@@ -115,6 +116,22 @@ public class CraftEventFactory {
      }
  
      /**

CraftBukkit-Patches/0054-Properly-Close-Inventories.patch

@@ -1,4 +1,4 @@
-From a813b607d41bfb17c13c0e57f90c55cf57e5c7b3 Mon Sep 17 00:00:00 2001
+From 24d31e902cd21b4851964186fefa7f4b6ded271e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 51db2db..0e7e09f 100644
+index c353b29..dc20587 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -690,6 +690,15 @@ public class Chunk {
+@@ -704,6 +704,15 @@ public class Chunk {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
@@ -25,7 +25,7 @@ index 51db2db..0e7e09f 100644
  
              this.world.a(tileentity);
          }
-@@ -699,6 +708,15 @@ public class Chunk {
+@@ -713,6 +722,15 @@ public class Chunk {
              java.util.Iterator<Object> iter = this.entitySlices[i].iterator();
              while (iter.hasNext()) {
                  Entity entity = (Entity) iter.next();

CraftBukkit-Patches/0064-Entity-ticking-chunk-caching.patch

@@ -1,4 +1,4 @@
-From 214a039d5fcb2ce28c32e580f91de4e23005bd86 Mon Sep 17 00:00:00 2001
+From d5f7eb5103fedc76dde546763d9c43d45038965d Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Tue, 16 Jul 2013 03:32:32 +0500
 Subject: [PATCH] Entity ticking chunk caching
@@ -70,4 +70,5 @@ index 8bd7876..52694f1 100644
          timings.entityTick.stopTiming(); // Spigot
          this.methodProfiler.c("tileEntities");
 -- 
-1.8.1.msysgit.1
+1.8.1.2
+

CraftBukkit-Patches/0068-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,14 +1,14 @@
-From a6a3d75d0771ece044c7fa466bccaeed0d98435e Mon Sep 17 00:00:00 2001
+From 996b74d6e6ccc084c15212dc9d16538b316cfc4b Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sat, 3 Aug 2013 19:53:48 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b1f86a0..79febb8 100644
+index 4f4b84f..65a77dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -401,6 +401,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -402,6 +402,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {

CraftBukkit-Patches/0069-Guard-entity-list.patch

@@ -1,14 +1,14 @@
-From 9acd15599ac94ac59fb7f387d299663b10d60afc Mon Sep 17 00:00:00 2001
+From a8c4b252bda955ac01b33f738537bbe645d9482a Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Sat, 3 Aug 2013 21:42:00 +0500
 Subject: [PATCH] Guard entity list
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 15117e5..37d6e1a 100644
+index 52694f1..f06a8df 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -29,7 +29,25 @@ import java.util.concurrent.Callable;
+@@ -29,7 +29,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
  public abstract class World implements IBlockAccess {
  
      public boolean d;
@@ -70,5 +70,5 @@ index 15117e5..37d6e1a 100644
          timings.entityTick.stopTiming(); // Spigot
          this.methodProfiler.c("tileEntities");
 -- 
-1.8.1.msysgit.1
+1.8.1.2