Fix merge conflicts.

Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch

@@ -1,4 +1,4 @@
-From 0360a12d5bbf44b37e3266777b7032c4e158a69d Mon Sep 17 00:00:00 2001
+From f6f824b0262999be08524092751f162b2cb75f61 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 24 Dec 2013 10:14:25 +1100
 Subject: [PATCH] Fix Tab Completion for Some Commands
@@ -22,10 +22,10 @@ index b888da1..e21d167 100644
 +    // Spigot End
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-index fb3c90f..a08ae80 100644
+index eb018f1..c70d512 100644
 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
-@@ -25,4 +25,12 @@ public class ReloadCommand extends BukkitCommand {
+@@ -27,4 +27,12 @@ public class ReloadCommand extends BukkitCommand {
  
          return true;
      }

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

@@ -1,4 +1,4 @@
-From 337e55ae0f39587d271afff1d4aa561bbb536816 Mon Sep 17 00:00:00 2001
+From 572ada533f8279e545e6cd0c410c7de76c384a76 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
 This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b4ad7d1..4c33f5a 100644
+index 1f936b0..cd304ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1626,4 +1626,14 @@ public final class CraftServer implements Server {
+@@ -1628,4 +1628,14 @@ public final class CraftServer implements Server {
      public UnsafeValues getUnsafe() {
          return CraftMagicNumbers.INSTANCE;
      }
@@ -192,5 +192,5 @@ index 5584353..8f5689f 100644
 +    // Spigot end
  }
 -- 
-1.9.5.msysgit.0
+2.1.0
 

CraftBukkit-Patches/0005-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From e0dfb516ccafe1b53dacfcedbf3ce60a713f6d02 Mon Sep 17 00:00:00 2001
+From ff513bbbcb78b4e8b6f16fa89c467f07c6b020bc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 7 Jul 2013 09:32:53 +1000
 Subject: [PATCH] Spigot Configuration
@@ -55,10 +55,10 @@ index 8dde097..3c1ba5b 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4c33f5a..51e4489 100644
+index cd304ac..09c723f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -246,8 +246,10 @@ public final class CraftServer implements Server {
+@@ -247,8 +247,10 @@ public final class CraftServer implements Server {
          chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
          loadIcon();
  
@@ -71,7 +71,7 @@ index 4c33f5a..51e4489 100644
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -673,6 +675,7 @@ public final class CraftServer implements Server {
+@@ -675,6 +677,7 @@ public final class CraftServer implements Server {
              logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
          }
  
@@ -79,7 +79,7 @@ index 4c33f5a..51e4489 100644
          for (WorldServer world : console.worlds) {
              world.worldData.setDifficulty(difficulty);
              world.setSpawnFlags(monsters, animals);
-@@ -687,11 +690,14 @@ public final class CraftServer implements Server {
+@@ -689,11 +692,14 @@ public final class CraftServer implements Server {
              } else {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }

CraftBukkit-Patches/0012-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From fe9d395a701fe1c0e369712a4b6e278c6fa861d0 Mon Sep 17 00:00:00 2001
+From 6df3453869ca09397fb5aa4cf8a2b07241297082 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
@@ -584,10 +584,10 @@ index 8a09a79..1d6be5f 100644
  
      public BiomeMeta a(EnumCreatureType enumcreaturetype, BlockPosition blockposition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 51e4489..5286c1e 100644
+index 09c723f..07f15d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1636,6 +1636,11 @@ public final class CraftServer implements Server {
+@@ -1638,6 +1638,11 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  

CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch

@@ -1,4 +1,4 @@
-From 61039f65756b60e8da46aa8d56f1bd2ac68b8044 Mon Sep 17 00:00:00 2001
+From f30f291e881b6b151649d9d73fe3be22987e7f4f Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Close Unloaded Save Files
@@ -18,10 +18,10 @@ index f4f72ef..1b03878 100644
      public static synchronized RegionFile a(File file, int i, int j) {
          File file1 = new File(file, "region");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5286c1e..3175d37 100644
+index 07f15d1..fa8ae87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -951,6 +951,31 @@ public final class CraftServer implements Server {
+@@ -953,6 +953,31 @@ public final class CraftServer implements Server {
  
          worlds.remove(world.getName().toLowerCase());
          console.worlds.remove(console.worlds.indexOf(handle));

CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From b1ab1f86b3f498bc176de5c3d7cfa8e805bd1b8b Mon Sep 17 00:00:00 2001
+From 19c48ebe81daff5f911758b59f9f733a70985f92 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.
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement SpawnerSpawnEvent.
 Adds BUKKIT-267
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index fe24b1f..ebcba7b 100644
+index e597d77..4bbd288 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -4,7 +4,11 @@ import com.google.common.collect.Lists;
@@ -50,7 +50,7 @@ index fe24b1f..ebcba7b 100644
                      }
 @@ -171,7 +185,12 @@ public abstract class MobSpawnerAbstract {
              }
-         } else if (entity instanceof EntityLiving && entity.world != null && flag) {
+         } else if (entity instanceof EntityInsentient && entity.world != null && flag) { // CraftBukkit - EntityLiving -> EntityInsentient
              ((EntityInsentient) entity).prepare(entity.world.E(new BlockPosition(entity)), (GroupDataEntity) null);
 -            entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
 +            // Spigot start - call SpawnerSpawnEvent, abort if cancelled

CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch

@@ -1,14 +1,14 @@
-From 36db424939a337a3a8e7434472cc96aa1600cb6f Mon Sep 17 00:00:00 2001
+From cb82fac72bf44594984a3d728bb61ef69a477df3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3175d37..b9cace3 100644
+index fa8ae87..3c83b5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1555,6 +1555,13 @@ public final class CraftServer implements Server {
+@@ -1557,6 +1557,13 @@ public final class CraftServer implements Server {
      }
  
      public List<String> tabCompleteCommand(Player player, String message) {

CraftBukkit-Patches/0030-Configurable-Messages.patch

@@ -1,4 +1,4 @@
-From aa1b154f3e62b92f5ff71471e3664d682893ccb2 Mon Sep 17 00:00:00 2001
+From a04f9c5ed261f87073902b047999ef2ab889e5ec Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@@ -45,10 +45,10 @@ index 6d8df63..fad41c2 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b9cace3..ce4857d 100644
+index 3c83b5a..18e736a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -627,11 +627,7 @@ public final class CraftServer implements Server {
+@@ -628,11 +628,7 @@ public final class CraftServer implements Server {
              return true;
          }
  

CraftBukkit-Patches/0056-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From dd16552b2a4448c9ef49ac7d7ecf9ce2275a591b Mon Sep 17 00:00:00 2001
+From 4b2d54406c33c04c83feee237533eda052a001dc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -132,10 +132,10 @@ index b370b6d..fdb4b3c 100644
  
          if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ce4857d..5c1cfaa 100644
+index 18e736a..be4a647 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -560,7 +560,13 @@ public final class CraftServer implements Server {
+@@ -561,7 +561,13 @@ public final class CraftServer implements Server {
  
      @Override
      public long getConnectionThrottle() {

CraftBukkit-Patches/0087-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch

@@ -1,14 +1,14 @@
-From 7e3d499531ee3534ba5489baefea4df6c495d4e8 Mon Sep 17 00:00:00 2001
+From 3ca1af93f74b795f04672d8eabd3c9c4dff9ac42 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5c1cfaa..6ea7371 100644
+index be4a647..36c0f7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -316,8 +316,11 @@ public final class CraftServer implements Server {
+@@ -317,8 +317,11 @@ public final class CraftServer implements Server {
          }
  
          if (type == PluginLoadOrder.POSTWORLD) {
@@ -21,7 +21,7 @@ index 5c1cfaa..6ea7371 100644
              commandMap.registerServerAliases();
              loadCustomPermissions();
              DefaultPermissions.registerCorePermissions();
-@@ -330,10 +333,19 @@ public final class CraftServer implements Server {
+@@ -331,10 +334,19 @@ public final class CraftServer implements Server {
          pluginManager.disablePlugins();
      }
  

CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch

@@ -1,11 +1,11 @@
-From f046797d2665130f7d79ff4bf2f0ad3a109c9ccb Mon Sep 17 00:00:00 2001
+From 8ddaa3c865b7b3c98cbbc727e802e4e3dd2f3dd6 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Tue, 25 Feb 2014 15:15:26 -0400
 Subject: [PATCH] Cancellable WitherSkull potion effect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java
-index a4df9a1..b809e1b 100644
+index a78e84c..e3f26a4 100644
 --- a/src/main/java/net/minecraft/server/EntityWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java
 @@ -35,8 +35,11 @@ public class EntityWitherSkull extends EntityFireball {
@@ -15,8 +15,8 @@ index a4df9a1..b809e1b 100644
 +                // Spigot start
 +                boolean didDamage = false;
                  if (this.shooter != null) {
--                    if (movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F)) {
+-                    if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F)) { // CraftBukkit
-+                    didDamage = movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F);
++                    didDamage = movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F);
 +                    if (didDamage) {
                          if (!movingobjectposition.entity.isAlive()) {
                              this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit

CraftBukkit-Patches/0104-Check-for-blank-OfflinePlayer-Names.patch

@@ -1,14 +1,14 @@
-From 32fbe7a38144a13132183ffab76bfd151b30bcf4 Mon Sep 17 00:00:00 2001
+From 641b1ace896a1dbf1432836fdd8b9622222d74be Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 17:21:24 +1000
 Subject: [PATCH] Check for blank OfflinePlayer Names
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6ea7371..31a7a87 100644
+index 36c0f7e..db7a8f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1275,6 +1275,7 @@ public final class CraftServer implements Server {
+@@ -1277,6 +1277,7 @@ public final class CraftServer implements Server {
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
          Validate.notNull(name, "Name cannot be null");

CraftBukkit-Patches/0112-Don-t-special-case-invalid-usernames-for-UUIDs.patch

@@ -1,14 +1,14 @@
-From e1d9d74dfdeca18f29c541bb9b2fc05034654cc9 Mon Sep 17 00:00:00 2001
+From d2eeb11279110f12817236b497688b036d093bc8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 18:58:00 +1000
 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 31a7a87..8964a18 100644
+index db7a8f4..acc2105 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1277,11 +1277,6 @@ public final class CraftServer implements Server {
+@@ -1279,11 +1279,6 @@ public final class CraftServer implements Server {
          Validate.notNull(name, "Name cannot be null");
          com.google.common.base.Preconditions.checkArgument( !org.apache.commons.lang.StringUtils.isBlank( name ), "Name cannot be blank" ); // Spigot
  

CraftBukkit-Patches/0144-Only-fetch-an-online-UUID-in-online-mode.patch

@@ -1,4 +1,4 @@
-From fbbc8a3e4d4aaf7ea482c0b3780af03f33059183 Mon Sep 17 00:00:00 2001
+From 53d5708c80bc7e87eec68fa31aca82c38b93ad89 Mon Sep 17 00:00:00 2001
 From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
 Date: Wed, 30 Jul 2014 01:19:51 +0200
 Subject: [PATCH] Only fetch an online UUID in online mode
@@ -12,10 +12,10 @@ You want to store data for player "Test"  who never joined. An online UUID is cr
 The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8964a18..8b4b580 100644
+index acc2105..7cb8a31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1279,8 +1279,14 @@ public final class CraftServer implements Server {
+@@ -1281,8 +1281,14 @@ public final class CraftServer implements Server {
  
          OfflinePlayer result = getPlayerExact(name);
          if (result == null) {

CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch

@@ -1,4 +1,4 @@
-From 05775c0fe84ae7279ae91c2b06e690f3f4d22cf7 Mon Sep 17 00:00:00 2001
+From 3b859f8d9d144e22949ff40876ed027402dbdcf5 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 13:06:05 +1100
 Subject: [PATCH] BungeeCord Chat API
@@ -58,7 +58,7 @@ index 0000000..f9a25e9
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8b4b580..980dd99 100644
+index 7cb8a31..d7e3919 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -121,6 +121,7 @@ import io.netty.buffer.ByteBufOutputStream;
@@ -69,7 +69,7 @@ index 8b4b580..980dd99 100644
  
  public final class CraftServer implements Server {
      private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
-@@ -1689,6 +1690,20 @@ public final class CraftServer implements Server {
+@@ -1691,6 +1692,20 @@ public final class CraftServer implements Server {
          {
              return org.spigotmc.SpigotConfig.config;
          }
@@ -91,7 +91,7 @@ index 8b4b580..980dd99 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 84dd215..c315654 100644
+index e529156..c81d5d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -18,6 +18,7 @@ import java.util.Set;