Rebuild #2

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

@@ -1,4 +1,4 @@
-From 2b0e4876737d8372657b70e7e7434eb48242780a Mon Sep 17 00:00:00 2001
+From ea20c209ed09e9662bf1a939b9db516333eaad87 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
@@ -25,10 +25,10 @@ index 629e6b8..4b3fcac 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 621c89f..20357f9 100644
+index 9e158e1..80fc5bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1353,4 +1353,14 @@ public class CraftWorld implements World {
+@@ -1369,4 +1369,14 @@ public class CraftWorld implements World {
              cps.queueUnload(chunk.locX, chunk.locZ);
          }
      }

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

@@ -1,4 +1,4 @@
-From c11c0c61277a336160a4b8ad4d85157028cd6ccf Mon Sep 17 00:00:00 2001
+From ea3e297e50d376728766ad0cb08ba72ffb81e3a7 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
@@ -106,10 +106,10 @@ index 7b933b8..d238c81 100644
          // this.entityList.addAll(collection);
          Iterator iterator = collection.iterator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 20357f9..7b05b6a 100644
+index 80fc5bf..441f8a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -165,6 +165,7 @@ public class CraftWorld implements World {
+@@ -166,6 +166,7 @@ public class CraftWorld implements World {
      }
  
      public boolean unloadChunkRequest(int x, int z, boolean safe) {
@@ -117,7 +117,7 @@ index 20357f9..7b05b6a 100644
          if (safe && isChunkInUse(x, z)) {
              return false;
          }
-@@ -175,6 +176,7 @@ public class CraftWorld implements World {
+@@ -176,6 +177,7 @@ public class CraftWorld implements World {
      }
  
      public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@@ -125,7 +125,7 @@ index 20357f9..7b05b6a 100644
          if (safe && isChunkInUse(x, z)) {
              return false;
          }
-@@ -242,6 +244,7 @@ public class CraftWorld implements World {
+@@ -243,6 +245,7 @@ public class CraftWorld implements World {
      }
  
      public boolean loadChunk(int x, int z, boolean generate) {

CraftBukkit-Patches/0012-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From ef6ae2631a262717e532a740039959dc9884158e Mon Sep 17 00:00:00 2001
+From 77ed864e5acb8a0e55ab48d6a73af57979427555 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -599,10 +599,10 @@ index 2aceeb4..ed0c30c 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7b05b6a..609b483 100644
+index 441f8a3..ef1ff3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -255,9 +255,11 @@ public class CraftWorld implements World {
+@@ -256,9 +256,11 @@ public class CraftWorld implements World {
          net.minecraft.server.Chunk chunk = world.chunkProviderServer.chunks.get(LongHash.toLong(x, z));
  
          if (chunk == null) {

CraftBukkit-Patches/0053-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From a983b605d42d3258b815f5aaf8fe0d25f48d9b4f Mon Sep 17 00:00:00 2001
+From 627c92006e29f83d04674a54f5cb603d4a94c0fb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@@ -123,7 +123,7 @@ index 51db92b..c1789a0 100644
                  BlockState previous = it.next();
 diff --git a/src/main/java/org/spigotmc/AntiXray.java b/src/main/java/org/spigotmc/AntiXray.java
 new file mode 100644
-index 0000000..7221b50
+index 0000000..6f28cd8
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/AntiXray.java
 @@ -0,0 +1,234 @@
@@ -358,7 +358,7 @@ index 0000000..7221b50
 +        // rendering they can be seen through therefor we special
 +        // case them so that the antixray doesn't show the fake
 +        // blocks around them.
-+        return block.isOccluding() && block != Blocks.MOB_SPAWNER && block != Blocks.BARRIER;
++        return block.isOccluding() && block != Blocks.MOB_SPAWNER;
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java

CraftBukkit-Patches/0061-Particle-API.patch

@@ -1,4 +1,4 @@
-From 6404032831cb51e6bd880d03d44b1067fc6a1dfb Mon Sep 17 00:00:00 2001
+From 63d8fa92b3341ead136bef29d489c07a2ca92da0 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
@@ -19,10 +19,10 @@ index 7de0de5..13f9e9d 100644
              datavalue = 0;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 609b483..5dc77b1 100644
+index ef1ff3f..5d12a5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -822,28 +822,18 @@ public class CraftWorld implements World {
+@@ -838,28 +838,18 @@ public class CraftWorld implements World {
              Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
          }
  
@@ -60,7 +60,7 @@ index 609b483..5dc77b1 100644
      }
  
      public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
-@@ -1361,6 +1351,70 @@ public class CraftWorld implements World {
+@@ -1377,6 +1367,70 @@ public class CraftWorld implements World {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {

CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch

@@ -1,4 +1,4 @@
-From d17e6b05855b8905b660874d9d0ac21e5480d0ed Mon Sep 17 00:00:00 2001
+From b7877c0289f388e5873a287aba5a6051fe7fbe53 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 21:07:18 +1100
 Subject: [PATCH] Improve AutoSave Mechanism
@@ -47,10 +47,10 @@ index 3dd4201..4c254a7 100644
              SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5dc77b1..62ad47d 100644
+index 5d12a5c..a4d396d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -726,12 +726,17 @@ public class CraftWorld implements World {
+@@ -742,12 +742,17 @@ public class CraftWorld implements World {
      }
  
      public void save() {

CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch

@@ -1,4 +1,4 @@
-From efc9fc28a765e0055cbe3e327ab42d948df3a47f Mon Sep 17 00:00:00 2001
+From a936dd8257a14e8645b052fa880425a0f3725565 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API
@@ -39,10 +39,10 @@ index d355e68..286fdef 100644
              //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
              float pitch = 0.8F + this.random.nextFloat() * 0.2F;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 62ad47d..6b26c8f 100644
+index a4d396d..a3e8d48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1420,6 +1420,22 @@ public class CraftWorld implements World {
+@@ -1436,6 +1436,22 @@ public class CraftWorld implements World {
          {
              CraftWorld.this.playEffect( location, effect, 0 );
          }

CraftBukkit-Patches/0134-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch

@@ -1,4 +1,4 @@
-From 6fe661e8496b05440d63d48f5f90a571d9fa956a Mon Sep 17 00:00:00 2001
+From 5d42af4a176141bd9b418a5a227dc42d40fa346a Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 12:49:48 +0100
 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
@@ -26,10 +26,10 @@ index 84c8721..ea5adbe 100644
                  EntityOcelot entityocelot = new EntityOcelot(this.world);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6b26c8f..2bbe104 100644
+index a3e8d48..db0697b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1092,6 +1092,12 @@ public class CraftWorld implements World {
+@@ -1108,6 +1108,12 @@ public class CraftWorld implements World {
          }
  
          if (entity != null) {