Upstream merge.

By: md_5 <md_5@live.com.au>

Bukkit-Patches/0006-BungeeCord-Support.patch

@@ -1,14 +1,14 @@
-From d4a9dfb80cd5f9f6a45bd291e8297a749f665b2c Mon Sep 17 00:00:00 2001
+From 90e7f1b07d3998ff3eabc59edb00fe2993b02eb8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ab022b5..39d3800 100644
+index 3ec374b..cc9c3b2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -709,4 +709,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -721,4 +721,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @see Player#setHealthScaled(boolean)
       */
      public double getHealthScale();

Bukkit-Patches/0008-Add-Particle-API.patch

@@ -1,11 +1,11 @@
-From 67d547e70742f6fe39e9b675cb1ede34f413ceed Mon Sep 17 00:00:00 2001
+From ae6b528446bfbe1c5c5e8d4301287364f0cc8ddd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API
 
 
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index 175750f..ae1f4fd 100644
+index 708bee9..62c7c11 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
 @@ -5,6 +5,7 @@ import java.util.Map;
@@ -16,7 +16,7 @@ index 175750f..ae1f4fd 100644
  import org.bukkit.potion.Potion;
  
  /**
-@@ -78,33 +79,193 @@ public enum Effect {
+@@ -78,27 +79,178 @@ public enum Effect {
      /**
       * The flames seen on a mobspawner; a visual effect.
       */
@@ -196,9 +196,10 @@ index 175750f..ae1f4fd 100644
       *
 -     * @return ID of this effect
 +     * @return if this Effect isn't of type PARTICLE it returns ID of this effect
+      * @deprecated Magic value
       */
-     public int getId() {
-         return this.id;
+     @Deprecated
+@@ -107,6 +259,15 @@ public enum Effect {
      }
  
      /**
@@ -214,7 +215,7 @@ index 175750f..ae1f4fd 100644
       * @return The type of the effect.
       */
      public Type getType() {
-@@ -112,7 +273,7 @@ public enum Effect {
+@@ -114,7 +275,7 @@ public enum Effect {
      }
  
      /**
@@ -223,7 +224,7 @@ index 175750f..ae1f4fd 100644
       */
      public Class<?> getData() {
          return this.data;
-@@ -130,12 +291,32 @@ public enum Effect {
+@@ -134,12 +295,32 @@ public enum Effect {
  
      static {
          for (Effect effect : values()) {
@@ -259,10 +260,10 @@ index 175750f..ae1f4fd 100644
 +    public enum Type {SOUND, VISUAL, PARTICLE}
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c86cfbc..186bb77 100644
+index 62fadda..39c72c5 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1066,6 +1066,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1070,6 +1070,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean isGameRule(String rule);
  
@@ -320,10 +321,10 @@ index c86cfbc..186bb77 100644
       * Represents various map environment types that a world may be
       */
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 39d3800..be2f4dc 100644
+index cc9c3b2..8eab616 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -724,6 +724,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -736,6 +736,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

Bukkit-Patches/0011-Update-Depends.patch

@@ -1,4 +1,4 @@
-From 7d30d01ca1ae5c7c6fcf81396ad4919360c4e81c Mon Sep 17 00:00:00 2001
+From 69feff718e80cd27a3bcc2f44f11e3f95c271631 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 4 Jul 2013 20:05:19 +1000
 Subject: [PATCH] Update Depends
@@ -6,10 +6,10 @@ Subject: [PATCH] Update Depends
 - All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
 
 diff --git a/pom.xml b/pom.xml
-index 95d042b..b011de6 100644
+index 2b1abbb..14833af 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -77,21 +77,21 @@
+@@ -78,21 +78,21 @@
          <dependency>
              <groupId>org.yaml</groupId>
              <artifactId>snakeyaml</artifactId>
@@ -34,7 +34,7 @@ index 95d042b..b011de6 100644
              <type>jar</type>
              <scope>compile</scope>
          </dependency>
-@@ -105,7 +105,7 @@
+@@ -106,7 +106,7 @@
          <dependency>
              <groupId>commons-lang</groupId>
              <artifactId>commons-lang</artifactId>

Bukkit-Patches/0016-Player-Collision-API.patch

@@ -1,14 +1,14 @@
-From 9836664f97abdff7f7eaa35ee496e496976270e0 Mon Sep 17 00:00:00 2001
+From c5cfcb06166b8f6a1e410bfc19340fdd8e641019 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index be2f4dc..cb99199 100644
+index 8eab616..9ee8f5f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -729,6 +729,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -741,6 +741,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }