Upstream merge.

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 5a203aaea5ba33c3747926d34ddbb46176bf7ca7 Mon Sep 17 00:00:00 2001
+From ffd577849560a3a4b26ee82852a0063466a244ba Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
@@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
 Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
 
 diff --git a/pom.xml b/pom.xml
-index 34b539b..017eecb 100644
+index 9298500..c623677 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -26,7 +26,7 @@ index 34b539b..017eecb 100644
  
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -20,6 +20,13 @@
+@@ -20,10 +20,17 @@
      <maven.compiler.target>1.6</maven.compiler.target>
    </properties>
  
@@ -37,11 +37,6 @@ index 34b539b..017eecb 100644
 +    <relativePath>../pom.xml</relativePath>
 +  </parent>
 +
-   <repositories>
-       <repository>
-           <id>sonatype-nexus-snapshots</id>
-@@ -29,8 +36,8 @@
- 
    <dependencies>
      <dependency>
 -      <groupId>org.bukkit</groupId>
@@ -51,7 +46,7 @@ index 34b539b..017eecb 100644
        <version>${project.version}</version>
        <type>jar</type>
        <scope>compile</scope>
-@@ -104,21 +111,39 @@
+@@ -93,21 +100,39 @@
  
    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
    <build>
@@ -94,7 +89,7 @@ index 34b539b..017eecb 100644
              <phase>compile</phase>
              <goals>
                <goal>gitdescribe</goal>
-@@ -135,7 +160,7 @@
+@@ -124,7 +149,7 @@
              <manifestEntries>
                <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
                <Implementation-Title>CraftBukkit</Implementation-Title>

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

@@ -1,4 +1,4 @@
-From c3d3581a7451652d1808b50ad92de7c8e03746e9 Mon Sep 17 00:00:00 2001
+From 3d085f28590dfc86aec47a6412dbf6dabfcaafc8 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 b4ad7d1..4c33f5a 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4ff9c1a..486a828 100644
+index 066c681..3f134f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1347,4 +1347,14 @@ public class CraftWorld implements World {
+@@ -1372,4 +1372,14 @@ public class CraftWorld implements World {
              cps.queueUnload(chunk.locX, chunk.locZ);
          }
      }
@@ -64,7 +64,7 @@ index dca8520..bf48e6e 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 dee0d4e..9d1e3c3 100644
+index 705381f..7a9b11c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -535,4 +535,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

CraftBukkit-Patches/0061-Particle-API.patch

@@ -1,4 +1,4 @@
-From 37586b4524ce86035912e75dff6a03f252012546 Mon Sep 17 00:00:00 2001
+From 96b0a2e9d93bd34b4fb865fe9b1bd78fcc700609 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 3b660ff..eeb1ecb 100644
+index 50469b1..a57136c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -816,28 +816,18 @@ public class CraftWorld implements World {
+@@ -841,28 +841,18 @@ public class CraftWorld implements World {
              Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
          }
  
@@ -60,7 +60,7 @@ index 3b660ff..eeb1ecb 100644
      }
  
      public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
-@@ -1355,6 +1345,70 @@ public class CraftWorld implements World {
+@@ -1380,6 +1370,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 a5d387a1e94b03c99994b907c50d4e281366b0f1 Mon Sep 17 00:00:00 2001
+From 6f14392ef8bc8666ccf12636c7ba9bba7068ab19 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 7ce37c0..4a2f084 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 eeb1ecb..b8d30f5 100644
+index a57136c..5ec836d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -693,12 +693,17 @@ public class CraftWorld implements World {
+@@ -718,12 +718,17 @@ public class CraftWorld implements World {
      }
  
      public void save() {

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

@@ -1,4 +1,4 @@
-From 55e5d79ca141027b6c7baa4be95f98e0388f52ee Mon Sep 17 00:00:00 2001
+From a7317451acf715a588f8e7d6585a8e6a74be66ad 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 5bda5d3..1bbce9b 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 b8d30f5..bb4cb9d 100644
+index 5ec836d..2c5238e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1414,6 +1414,22 @@ public class CraftWorld implements World {
+@@ -1439,6 +1439,22 @@ public class CraftWorld implements World {
          {
              CraftWorld.this.playEffect( location, effect, 0 );
          }

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

@@ -1,4 +1,4 @@
-From 21dd043251c37f1a6d30d7c39964ea682443f080 Mon Sep 17 00:00:00 2001
+From 9afa26819f0fe759f929a385f7cc31327e0a0b61 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 a6b72d8..0f5d09b 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 bb4cb9d..c6ef0fd 100644
+index 2c5238e..a03fa41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1086,6 +1086,12 @@ public class CraftWorld implements World {
+@@ -1111,6 +1111,12 @@ public class CraftWorld implements World {
          }
  
          if (entity != null) {