Fix conflicts.

Bukkit-Patches/0004-BungeeCord-Support.patch

@@ -1,17 +1,17 @@
-From 28fcaf994cb381caea6fb5e3f490901de73aebcb Mon Sep 17 00:00:00 2001
+From 50ea9ab7498d7790cf3cdc882eb2f7cff3dd6d73 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 6b955e4..b60bdf6 100644
+index 1b54b48..ced2d6b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1055,4 +1055,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1076,4 +1076,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
-      * {@link GameMode#SPECTATOR}
       */
-     public void setSpectatorTarget(Entity entity);
+     @Deprecated
+     public void resetTitle();
 +
 +    // Spigot start
 +    public class Spigot extends Entity.Spigot

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

@@ -1,4 +1,4 @@
-From fd2b5c26b1ca395533cad576b1354f04ee18293d Mon Sep 17 00:00:00 2001
+From ae09c30b8e2662ceb485199d761d4c8aa021ee87 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
@@ -332,10 +332,10 @@ index 127ad9d..6613286 100644
       * Gets the world border for this world.
       *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b60bdf6..524a8d9 100644
+index ced2d6b..c136208 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1070,6 +1070,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1091,6 +1091,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

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

@@ -1,14 +1,14 @@
-From 9374f413d001d2151e96b195f6a8d8b5c6183a7f Mon Sep 17 00:00:00 2001
+From c4a87449c9728a19bcff5ba01db04343a02189a1 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 524a8d9..c31faf4 100644
+index c136208..2d054ba 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1075,6 +1075,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1096,6 +1096,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

Bukkit-Patches/0015-Add-respawn-API.patch

@@ -1,14 +1,14 @@
-From 2779c79eff1bdcd51f3712dd812bc339fbca701a Mon Sep 17 00:00:00 2001
+From 4d98b3bae2ce9e01b5fe2ea35d8c43b297a07698 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:35:58 +0200
 Subject: [PATCH] Add respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c31faf4..9c473a5 100644
+index 2d054ba..b7f4e9e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1096,6 +1096,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1117,6 +1117,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch

@@ -1,14 +1,14 @@
-From ebf11313636c42d00d968199ea8073fec321d2d7 Mon Sep 17 00:00:00 2001
+From 569fe828e8596f8d4773f725c4c9cd8555a6d628 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:10:49 +1100
 Subject: [PATCH] Implement Locale Getter for Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9c473a5..9c69579 100644
+index b7f4e9e..41b7b3c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1104,6 +1104,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1125,6 +1125,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch

@@ -1,14 +1,14 @@
-From 7342c02c8046b9b76b14c00d99011a4544ee5755 Mon Sep 17 00:00:00 2001
+From 96031401a0d28d40685afecf100e521e044f0753 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:02:11 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9c69579..93f57ac 100644
+index 41b7b3c..0f59c07 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1114,6 +1114,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1135,6 +1135,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

Bukkit-Patches/0028-BungeeCord-Chat-API.patch

@@ -1,4 +1,4 @@
-From 90f34dc0f7fbe4beb33ccba5e6db824c019e53e7 Mon Sep 17 00:00:00 2001
+From 26b7703296a3bd3f17e248689e2dc1bd72edc8b8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 12:59:14 +1100
 Subject: [PATCH] BungeeCord Chat API
@@ -53,10 +53,10 @@ index 52dd005..20edb77 100644
  
      Spigot spigot();
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 84cb51f..e3dd596 100644
+index d429074..9508e84 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1122,6 +1122,24 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1143,6 +1143,24 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }

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

@@ -1,4 +1,4 @@
-From bbdbd8c3974009a96c69dc0819d92c0409238bf8 Mon Sep 17 00:00:00 2001
+From 85eb074cb01b2de14b203a5f15fba5ea6d71d2e3 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 8849087..0b0074d 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8c9ead5..b6bd255 100644
+index 554e3b7..e3db8e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1383,4 +1383,14 @@ public class CraftWorld implements World {
+@@ -1380,4 +1380,14 @@ public class CraftWorld implements World {
              cps.queueUnload(chunk.locX, chunk.locZ);
          }
      }
@@ -104,12 +104,12 @@ index 64e346d..243e8e5 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 813adbb..3fe57cf 100644
+index abc135e..074df2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1326,4 +1326,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1346,4 +1346,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         Preconditions.checkArgument(getGameMode() == GameMode.SPECTATOR, "Player must be in spectator mode");
+         PacketPlayOutTitle packetReset = new PacketPlayOutTitle(EnumTitleAction.RESET, null);
-         getHandle().setSpectatorTarget((entity == null) ? null : ((CraftEntity) entity).getHandle());
+         getHandle().playerConnection.sendPacket(packetReset);
      }
 +
 +    // Spigot start

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

@@ -1,4 +1,4 @@
-From 615eaf3a0d839c48710b257037e809b0544827e0 Mon Sep 17 00:00:00 2001
+From 173502859d25e1820c875517ca7a435d1897e3dc 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
@@ -78,7 +78,7 @@ index 5ef2be4..8d50e05 100644
              this.trackedPlayers.remove(entityplayer);
              entityplayer.d(this.tracker);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index df4d9cd..68f4996 100644
+index 75d335f..61db17c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -940,6 +940,7 @@ public abstract class World implements IBlockAccess {
@@ -97,7 +97,7 @@ index df4d9cd..68f4996 100644
          entity.die();
          if (entity instanceof EntityHuman) {
              this.players.remove(entity);
-@@ -2498,6 +2500,7 @@ public abstract class World implements IBlockAccess {
+@@ -2491,6 +2493,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void b(Collection<Entity> collection) {
@@ -106,7 +106,7 @@ index df4d9cd..68f4996 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 b6bd255..18f4f21 100644
+index e3db8e1..07d1ee4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -167,6 +167,7 @@ public class CraftWorld implements World {
@@ -134,10 +134,10 @@ index b6bd255..18f4f21 100644
          if (generate) {
              // Use the default variant of loadChunk when generate == true.
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3fe57cf..ae25252 100644
+index 074df2b..a37085c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -216,6 +216,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void kickPlayer(String message) {

CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch

@@ -1,14 +1,14 @@
-From b945ad4d711097ee21e36708c69e9ffd1d6f0d97 Mon Sep 17 00:00:00 2001
+From 91a207cf310c507636fec4e119b0c4b55c3a0724 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 4 Mar 2013 18:45:52 +1100
 Subject: [PATCH] PlayerItemDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 3752690..b51da0e 100644
+index 2821afa..b722be5 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -338,6 +338,11 @@ public final class ItemStack {
+@@ -339,6 +339,11 @@ public final class ItemStack {
      }
  
      public boolean isDamaged(int i, Random random) {
@@ -20,7 +20,7 @@ index 3752690..b51da0e 100644
          if (!this.e()) {
              return false;
          } else {
-@@ -352,7 +357,16 @@ public final class ItemStack {
+@@ -353,7 +358,16 @@ public final class ItemStack {
                  }
  
                  i -= k;
@@ -38,7 +38,7 @@ index 3752690..b51da0e 100644
                      return false;
                  }
              }
-@@ -365,7 +379,7 @@ public final class ItemStack {
+@@ -366,7 +380,7 @@ public final class ItemStack {
      public void damage(int i, EntityLiving entityliving) {
          if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
              if (this.e()) {

CraftBukkit-Patches/0036-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From 75fe922e23f20ed1faef60d344900a1864967a65 Mon Sep 17 00:00:00 2001
+From 4e7f9d600c61430373fbe1961fccef936c9575e4 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
@@ -64,10 +64,10 @@ index e707dd7..b0681cf 100644
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
          super(worldserver, gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ae25252..5236f8f 100644
+index a37085c..7e75708 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1331,6 +1331,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1351,6 +1351,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
      private final Player.Spigot spigot = new Player.Spigot()
      {

CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch

@@ -1,14 +1,14 @@
-From b72d66e19b46ff1d5e57f70051f8ac4524b77ec0 Mon Sep 17 00:00:00 2001
+From 4120f14faf9a7ce6a77474a51e1d6670b091a464 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0ef7321..99cac72 100644
+index 7e75708..b79a31c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1183,7 +1183,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1184,7 +1184,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setFlySpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();
@@ -17,7 +17,7 @@ index 0ef7321..99cac72 100644
          player.updateAbilities();
  
      }
-@@ -1192,7 +1192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1193,7 +1193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setWalkSpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();

CraftBukkit-Patches/0045-Implement-respawn-API.patch

@@ -1,14 +1,14 @@
-From 912676be4d810f5268b2dfb76c86b4f976953ae7 Mon Sep 17 00:00:00 2001
+From 03820e05d3d87448b1242ed5ca4c68d9ffa01c74 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 001415a..7310212 100644
+index b79a31c..5556620 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1344,6 +1344,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1364,6 +1364,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              getHandle().collidesWithEntities = collides;
              getHandle().k = collides; // First boolean of Entity
          }

CraftBukkit-Patches/0055-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 7b42c80ec6eb9e4ab3490704eee7e085c8a29e70 Mon Sep 17 00:00:00 2001
+From 67e652a56682390e9edec21c3a25bd93508dc9ab 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
@@ -176,10 +176,10 @@ index d07b3b8..2801b5c 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7310212..d0e340e 100644
+index 5556620..587a55e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1333,6 +1333,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1353,6 +1353,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      {
  
          @Override

CraftBukkit-Patches/0060-Particle-API.patch

@@ -1,4 +1,4 @@
-From 2be988a9a8f53aa0a06de8e3c5236d27e7bae661 Mon Sep 17 00:00:00 2001
+From ba6908d565615b3dce4f455581ea9deed318fb62 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 41daf0a..8cd2bbb 100644
+index fc2a1ab..20e2416 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -839,28 +839,18 @@ public class CraftWorld implements World {
+@@ -836,28 +836,18 @@ public class CraftWorld implements World {
              Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
          }
  
@@ -60,7 +60,7 @@ index 41daf0a..8cd2bbb 100644
      }
  
      public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
-@@ -1391,6 +1381,70 @@ public class CraftWorld implements World {
+@@ -1388,6 +1378,70 @@ public class CraftWorld implements World {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {
@@ -132,10 +132,10 @@ index 41daf0a..8cd2bbb 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 d0e340e..add5310 100644
+index 587a55e..125fdff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -323,9 +323,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -324,9 +324,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void playEffect(Location loc, Effect effect, int data) {
          if (getHandle().playerConnection == null) return;
  
@@ -146,7 +146,7 @@ index d0e340e..add5310 100644
      }
  
      @Override
-@@ -1359,6 +1357,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1379,6 +1377,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
              }
          }

CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch

@@ -1,14 +1,14 @@
-From d794f5fb8f68abdd0eb37a7a48501cce85bc0e6f Mon Sep 17 00:00:00 2001
+From c6bf8a476317da9c7f0becfaa6a2f4deaafbcc98 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 15:57:57 +1100
 Subject: [PATCH] Disable Connected Check on setScoreboard
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 295565e..1a38905 100644
+index 125fdff..0868ff7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1242,7 +1242,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1243,7 +1243,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              throw new IllegalStateException("Cannot set scoreboard yet");
          }
          if (playerConnection.isDisconnected()) {

CraftBukkit-Patches/0068-Fix-ItemStack-Unbreakable-Code.patch

@@ -1,14 +1,14 @@
-From 184a2262511dd37ff81d4fbbdf9b8e33498ce7cc Mon Sep 17 00:00:00 2001
+From b33e57aa91bef9b61bffc1c73575eae1e4717212 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 10 Jan 2014 15:15:50 +1100
 Subject: [PATCH] Fix ItemStack Unbreakable Code
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index b51da0e..86b20c7 100644
+index b722be5..6808a46 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -286,7 +286,13 @@ public final class ItemStack {
+@@ -287,7 +287,13 @@ public final class ItemStack {
      }
  
      public boolean e() {

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

@@ -1,4 +1,4 @@
-From e4e219357c40024a14ffbbb6be133a8e215e8336 Mon Sep 17 00:00:00 2001
+From e69f1b13d3763a1b35faa94230b8a11dd5434b1f 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
@@ -60,10 +60,10 @@ index 0645e6b..c59f441 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 8cd2bbb..fa593f3 100644
+index 20e2416..0629805 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -743,12 +743,17 @@ public class CraftWorld implements World {
+@@ -740,12 +740,17 @@ public class CraftWorld implements World {
      }
  
      public void save() {

CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch

@@ -1,4 +1,4 @@
-From ff97313c051220642cbddada3b310bd70dec43c8 Mon Sep 17 00:00:00 2001
+From c0fc0c1045109ab22822c09d664da315180026b1 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:12:16 +1100
 Subject: [PATCH] Implement Locale Getter for Players
@@ -18,10 +18,10 @@ index ffdf25c..3438d3a 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 765a035..2ac69fa 100644
+index 0868ff7..de22116 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1414,6 +1414,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1434,6 +1434,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  getHandle().playerConnection.sendPacket( packet );
              }
          }

CraftBukkit-Patches/0079-Fix-dispensing-bone-meal-not-having-the-correct-data.patch

@@ -1,14 +1,14 @@
-From 6b1405183f0ce15b40b9d7aee6380ad1b228269f Mon Sep 17 00:00:00 2001
+From 2d59e3c8f8c49e57ee785c1de974ceba769a7009 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 6 Feb 2014 21:59:20 +0000
 Subject: [PATCH] Fix dispensing bone meal not having the correct data value
 
 
 diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java
-index 37fd3f2..f91c33d 100644
+index 381f6b8..bd88be5 100644
 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java
 +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java
-@@ -463,7 +463,7 @@ public class DispenserRegistry {
+@@ -464,7 +464,7 @@ public class DispenserRegistry {
  
                      // CraftBukkit start
                      org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());

CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch

@@ -1,14 +1,14 @@
-From 042311059313ac292ab658aa75e5a31f6220d395 Mon Sep 17 00:00:00 2001
+From 3b245affa462a68053dd26eadbea63306c485bd6 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2ac69fa..54c5933 100644
+index de22116..45e7267 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1420,6 +1420,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1440,6 +1440,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          {
             return getHandle().locale;
          }

CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch

@@ -1,14 +1,14 @@
-From b10a72c0cf0d1e2ce8a59cf6f667d5afbba7d758 Mon Sep 17 00:00:00 2001
+From eabcc1ffbca1c881f76af678ebed414c8f3ad536 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7343d88..7fa969e 100644
+index 45e7267..7460af5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1062,6 +1062,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1063,6 +1063,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {

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

@@ -1,4 +1,4 @@
-From 72c0d565077529a436c4cf03a62c6e8f9f65d17f Mon Sep 17 00:00:00 2001
+From 25f452d039fa88b161a5ff66859bd1517acf0952 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 fa593f3..2eac94c 100644
+index 0629805..d7b122f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1450,6 +1450,22 @@ public class CraftWorld implements World {
+@@ -1447,6 +1447,22 @@ public class CraftWorld implements World {
          {
              CraftWorld.this.playEffect( location, effect, 0 );
          }

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

@@ -1,4 +1,4 @@
-From 222279b067a8e701c7babcf32f8ea101105a2b4a Mon Sep 17 00:00:00 2001
+From 9d49fee2e7d303f46d087ad0e983d1c468e895e3 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 2121438..edcb307 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 2eac94c..89163ea 100644
+index d7b122f..c1d552a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1109,6 +1109,12 @@ public class CraftWorld implements World {
+@@ -1106,6 +1106,12 @@ public class CraftWorld implements World {
          }
  
          if (entity != null) {

CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch

@@ -1,14 +1,14 @@
-From 6bf2c472a19e3c1dc084c2cbaafd1175ab013ee2 Mon Sep 17 00:00:00 2001
+From 66f142c97e690ec9d271cc9dcdf6dae0ddf12262 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 19:54:41 +0100
 Subject: [PATCH] Prevent a crash involving attributes
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7fa969e..653badd 100644
+index 7460af5..33547eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1312,7 +1312,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1313,7 +1313,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  break;
              }
          }

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

@@ -1,4 +1,4 @@
-From c24a18a8fb71f125f0af50ff56b8f829fd723381 Mon Sep 17 00:00:00 2001
+From b0334050c2f90e96c0fb3716ef9e0cef8cade7ad 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
@@ -89,7 +89,7 @@ index 050c188..fd41124 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 ba77235..d0312a7 100644
+index 33547eb..e52e615 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -19,6 +19,7 @@ import java.util.Set;
@@ -99,8 +99,8 @@ index ba77235..d0312a7 100644
 +import net.md_5.bungee.api.chat.BaseComponent;
  
  import net.minecraft.server.*;
- 
+ import net.minecraft.server.PacketPlayOutTitle.EnumTitleAction;
-@@ -1441,6 +1442,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1461,6 +1462,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
              return java.util.Collections.unmodifiableSet( ret );
          }

CraftBukkit-Patches/0153-Use-FastMatches-for-ItemStack-Dirty-Check.patch

@@ -1,4 +1,4 @@
-From 6234597a7e55afd37c3b30c5a31b74440aa88e3c Mon Sep 17 00:00:00 2001
+From dabcdb18f4421128e642446c3a8ed74b73efd019 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 22 Feb 2015 12:27:40 +1100
 Subject: [PATCH] Use FastMatches for ItemStack Dirty Check
@@ -35,10 +35,10 @@ index 9c53acd..3e29730 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 86b20c7..1984e7c 100644
+index 6808a46..dbef942 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -454,6 +454,18 @@ public final class ItemStack {
+@@ -455,6 +455,18 @@ public final class ItemStack {
          return itemstack == null && itemstack1 == null ? true : (itemstack != null && itemstack1 != null ? (itemstack.tag == null && itemstack1.tag != null ? false : itemstack.tag == null || itemstack.tag.equals(itemstack1.tag)) : false);
      }