Rebase to 1.8.7

Bukkit/0002-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,14 +1,14 @@
-From 234311c25afbe2911ad928a22c910fc8c97e877a Mon Sep 17 00:00:00 2001
+From 32fe19a36fa32b1ae3caf093d9ce43dfd4506792 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a0fefd8..b25ed61 100644
+index 48e2508..b4c7a04 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -350,4 +350,18 @@ public interface LivingEntity extends Entity, Damageable, ProjectileSource {
+@@ -392,4 +392,18 @@ public interface LivingEntity extends Entity, Damageable, ProjectileSource {
       * @return whether the operation was successful
       */
      public boolean setLeashHolder(Entity holder);

Bukkit/0006-Add-getting-and-setting-of-entity-count.patch

@@ -1,14 +1,14 @@
-From b7c8909f9e0c9cac40d89b39f532238ec4c72a7d Mon Sep 17 00:00:00 2001
+From b680b67b978177abc2f05a43be526dc63b298439 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 16 Jun 2013 16:57:59 -0500
 Subject: [PATCH] Add getting and setting of entity count
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2c43d9e..433d624 100644
+index fd7d116..e6fdc1b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1047,6 +1047,20 @@ public final class Bukkit {
+@@ -1050,6 +1050,20 @@ public final class Bukkit {
      }
 
      /**
@@ -30,10 +30,10 @@ index 2c43d9e..433d624 100644
       *
       * @return the default server-icon; null values may be used by the
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ab6d047..ee707ac 100644
+index ca6c42c..2405e57 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -855,6 +855,20 @@ public interface Server extends PluginMessageRecipient {
+@@ -858,6 +858,20 @@ public interface Server extends PluginMessageRecipient {
      ScoreboardManager getScoreboardManager();
 
      /**

Bukkit/0009-Allow-playEffect-to-spawn-particles.patch

@@ -1,4 +1,4 @@
-From ab43a6d44ac1bf145719878cd9f7b401a02672a5 Mon Sep 17 00:00:00 2001
+From 8e0601bbe8eea68e554aca530454631660791d6d Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <purgames@gmail.com>
 Date: Sun, 17 Mar 2013 22:56:14 +0000
 Subject: [PATCH] Allow playEffect to spawn particles
@@ -249,7 +249,7 @@ index 2474a2d..2ac56e2 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 c763abe..c9de4b0 100644
+index 127ad9d..07b7896 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -13,6 +13,7 @@ import org.bukkit.block.Block;
@@ -260,7 +260,7 @@ index c763abe..c9de4b0 100644
  import org.bukkit.metadata.Metadatable;
  import org.bukkit.plugin.messaging.PluginMessageRecipient;
  import org.bukkit.util.Vector;
-@@ -729,6 +730,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -742,6 +743,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * Plays an effect to all players within a default radius around a given
       * location.
       *
@@ -277,7 +277,7 @@ index c763abe..c9de4b0 100644
       * @param location the {@link Location} around which players must be to
       *     hear the sound
       * @param effect the {@link Effect}
-@@ -772,6 +783,27 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -785,6 +796,27 @@ public interface World extends PluginMessageRecipient, Metadatable {
      public <T> void playEffect(Location location, Effect effect, T data, int radius);
 
      /**
@@ -306,10 +306,10 @@ index c763abe..c9de4b0 100644
       * including valid biome data. Used for representing an ungenerated chunk,
       * or for fetching only biome data without loading a chunk.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 229a71a..d13da1d 100644
+index 1d0daaf..95b3c57 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -262,6 +262,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -260,6 +260,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public <T> void playEffect(Location loc, Effect effect, T data);
 

Bukkit/0010-Add-API-to-control-if-a-player-can-push-other-entiti.patch

@@ -1,14 +1,14 @@
-From f8280e5feb56389986897f1c5b1245635f0f9a16 Mon Sep 17 00:00:00 2001
+From b3b4899adf5adb0e2fb165de8ceb931683c98162 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 28 Apr 2012 01:39:04 -0400
 Subject: [PATCH] Add API to control if a player can push other entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d13da1d..2e9f64c 100644
+index 95b3c57..d5f8b38 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -884,6 +884,18 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -882,6 +882,18 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      public void setFlying(boolean value);
 
      /**

Bukkit/0014-Visibility-API.patch

@@ -1,14 +1,14 @@
-From 77897e8a8cbe9c52b48111df4b9a0527644eee06 Mon Sep 17 00:00:00 2001
+From 56de4215bccabe0c1c6b4b4876d3f709bbd2682c Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Wed, 29 May 2013 23:52:37 -0500
 Subject: [PATCH] Visibility API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2e9f64c..10d37c6 100644
+index d5f8b38..718ca4c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -841,6 +841,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -839,6 +839,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
      public void hidePlayer(Player player);
 
@@ -17,7 +17,7 @@ index 2e9f64c..10d37c6 100644
      /**
       * Allows this player to see a player that was previously hidden
       *
-@@ -849,6 +851,13 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -847,6 +849,13 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      public void showPlayer(Player player);
 
      /**
@@ -31,7 +31,7 @@ index 2e9f64c..10d37c6 100644
       * Checks to see if a player has been hidden from this player
       *
       * @param player Player to check
-@@ -858,6 +867,15 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -856,6 +865,15 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      public boolean canSee(Player player);
 
      /**

Bukkit/0015-Update-the-POM-to-distinguish-SportBukkit-from-Bukki.patch

@@ -1,11 +1,11 @@
-From e490de2d7d7077bea7d70ec3e6e32e24f650726c Mon Sep 17 00:00:00 2001
+From 54ee45331974200fcb0d2dabd08fcdcf1adadd63 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Tue, 10 Dec 2013 23:16:10 -0600
 Subject: [PATCH] Update the POM to distinguish SportBukkit from Bukkit
 
 
 diff --git a/pom.xml b/pom.xml
-index 853fab1..6fcb2df 100644
+index 6f1dc61..c786c92 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,20 +3,13 @@
@@ -22,7 +22,7 @@ index 853fab1..6fcb2df 100644
 -    <artifactId>bukkit</artifactId>
 +    <groupId>tc.oc</groupId>
 +    <artifactId>sportbukkit-api</artifactId>
-     <version>1.8-R0.1-SNAPSHOT</version>
+     <version>1.8.7-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
 
 -    <name>Bukkit</name>
@@ -52,7 +52,7 @@ index 853fab1..6fcb2df 100644
 +            <url>https://repo.oc.tc/content/repositories/releases</url>
          </repository>
          <snapshotRepository>
--            <id>spigotmc-releases</id>
+-            <id>spigotmc-snapshots</id>
 -            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 +            <id>overcast-deployment</id>
 +            <url>https://repo.oc.tc/content/repositories/snapshots</url>

Bukkit/0016-Add-getHostname-to-Player.patch

@@ -1,14 +1,14 @@
-From 1be707960b2e0e7c42dc6ab4036b789766dc2179 Mon Sep 17 00:00:00 2001
+From 6e00e6f663ce4a303fe09ae664b3ae1786118ff3 Mon Sep 17 00:00:00 2001
 From: Marcos Vives Del Sol <socram8888@gmail.com>
 Date: Sun, 28 Jul 2013 21:56:56 +0200
 Subject: [PATCH] Add getHostname to Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 10d37c6..29dcb5c 100644
+index 718ca4c..cdbbd1e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1069,4 +1069,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1067,4 +1067,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @see Player#setHealthScaled(boolean)
       */
      public double getHealthScale();

Bukkit/0018-Allow-plugins-to-access-player-locale.patch

@@ -1,14 +1,14 @@
-From 139cb9a1ecbd09f7f6008c1071b0b100691494f5 Mon Sep 17 00:00:00 2001
+From 2d2a605361dbd144a7631d28301691e5298f61c3 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Sun, 5 Jan 2014 20:32:00 -0600
 Subject: [PATCH] Allow plugins to access player locale
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 29dcb5c..b3d078e 100644
+index cdbbd1e..dca6b42 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1079,4 +1079,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1077,4 +1077,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @return The hostname and port
       */
      public String getHostname();

Bukkit/0020-Add-API-to-disable-potion-particles.patch → Bukkit/0019-Add-API-to-disable-potion-particles.patch

@@ -1,14 +1,14 @@
-From ebc8d38ec25b798430be473627dcc73da72dd9f4 Mon Sep 17 00:00:00 2001
+From 65282d586fb74e8977b29b9b6b16111860e212c3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 9 May 2014 23:44:41 -0400
 Subject: [PATCH] Add API to disable potion particles
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index b25ed61..471bea8 100644
+index b4c7a04..a9df62b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -276,6 +276,13 @@ public interface LivingEntity extends Entity, Damageable, ProjectileSource {
+@@ -318,6 +318,13 @@ public interface LivingEntity extends Entity, Damageable, ProjectileSource {
      public Collection<PotionEffect> getActivePotionEffects();
 
      /**

Bukkit/0021-Add-knockback-reduction.patch → Bukkit/0020-Add-knockback-reduction.patch

@@ -1,4 +1,4 @@
-From 301a93fd54841834f752e3a9c66f998befce6164 Mon Sep 17 00:00:00 2001
+From e63897f6e3f3f2d0b910b3cb69cb6cfcd4416f6b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 18 May 2014 03:16:26 -0400
 Subject: [PATCH] Add knockback reduction

Bukkit/0022-Add-PlayerLocaleChangeEvent.patch → Bukkit/0021-Add-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From 16eca3cbdb1e4b4e514b1c1672bb970d1ff7f040 Mon Sep 17 00:00:00 2001
+From 772d263faf54f3fb63b4d7e05f6cd31a584bee59 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 2 Sep 2014 20:35:37 -0500
 Subject: [PATCH] Add PlayerLocaleChangeEvent

Bukkit/0023-Simple-bulk-block-replacement.patch → Bukkit/0022-Simple-bulk-block-replacement.patch

@@ -1,4 +1,4 @@
-From 786521a778c25edcd87af21096f2701c0633f39b Mon Sep 17 00:00:00 2001
+From ab87c30dc96e520dda157ca3fc2db526a74103ef Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 28 Sep 2014 05:47:53 -0400
 Subject: [PATCH] Simple bulk block replacement

Bukkit/0024-Fix-combustion-events.patch → Bukkit/0023-Fix-combustion-events.patch

@@ -1,4 +1,4 @@
-From 01d5374beb7c036d109a086d5536754e766ccae6 Mon Sep 17 00:00:00 2001
+From 38a948decc36ea446a0fbca46f09dcdc03ce4b7f Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Thu, 30 Oct 2014 00:40:30 -0400
 Subject: [PATCH] Fix combustion events

Bukkit/0025-Add-PlayerAttackEntityEvent.patch → Bukkit/0024-Add-PlayerAttackEntityEvent.patch

@@ -1,4 +1,4 @@
-From b5dfb8fadde8271e6f2f99ba39b2682d30cf2856 Mon Sep 17 00:00:00 2001
+From 7860a3dc212e6c3ba9a7bf1e75bd922dff194863 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 15 Nov 2014 16:17:15 -0500
 Subject: [PATCH] Add PlayerAttackEntityEvent

Bukkit/0026-Expose-the-server-CommandMap.patch → Bukkit/0025-Expose-the-server-CommandMap.patch

@@ -1,11 +1,11 @@
-From a4daa161561ecd87eb72e3497c31c58111469e86 Mon Sep 17 00:00:00 2001
+From bf617528c46fbac87f1701f77a31c7333235196d Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 29 Oct 2014 19:08:55 -0400
 Subject: [PATCH] Expose the server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 433d624..4b36b2b 100644
+index e6fdc1b..3bb1ca2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -14,6 +14,7 @@ import java.util.logging.Logger;
@@ -16,7 +16,7 @@ index 433d624..4b36b2b 100644
  import org.bukkit.command.CommandSender;
  import org.bukkit.command.ConsoleCommandSender;
  import org.bukkit.command.PluginCommand;
-@@ -943,6 +944,13 @@ public final class Bukkit {
+@@ -946,6 +947,13 @@ public final class Bukkit {
      }
 
      /**
@@ -31,7 +31,7 @@ index 433d624..4b36b2b 100644
       * chunk.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ee707ac..54bfc6b 100644
+index 2405e57..ce3a755 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -14,6 +14,7 @@ import java.util.logging.Logger;
@@ -42,7 +42,7 @@ index ee707ac..54bfc6b 100644
  import org.bukkit.command.CommandSender;
  import org.bukkit.command.ConsoleCommandSender;
  import org.bukkit.command.PluginCommand;
-@@ -722,6 +723,11 @@ public interface Server extends PluginMessageRecipient {
+@@ -725,6 +726,11 @@ public interface Server extends PluginMessageRecipient {
      public HelpMap getHelpMap();
 
      /**

Bukkit/0027-EventException-knows-the-source-Event.patch → Bukkit/0026-EventException-knows-the-source-Event.patch

@@ -1,4 +1,4 @@
-From 972262a39af248384f5325cd108163786970f78b Mon Sep 17 00:00:00 2001
+From b846b92dc1577f1734747f5a4052b895ce7d8bf0 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 9 Dec 2014 05:23:05 -0500
 Subject: [PATCH] EventException knows the source Event
@@ -86,10 +86,10 @@ index 84638e8..aef8d49 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 687029f..e934d51 100644
+index 2118771..900c562 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -294,9 +294,9 @@ public final class JavaPluginLoader implements PluginLoader {
+@@ -299,9 +299,9 @@ public final class JavaPluginLoader implements PluginLoader {
                          }
                          method.invoke(listener, event);
                      } catch (InvocationTargetException ex) {