Rebuild patches

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

@@ -1,4 +1,4 @@
-From e3469d0a9e3751ba2c72e62022d2749a40312dd5 Mon Sep 17 00:00:00 2001
+From 264ff17cfc09c59ab5b65acf5789129069ffe97c 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 d330226..6b37266 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f22885f..2d8edf6 100644
+index 9e0b5af..f85bf83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1462,4 +1462,14 @@ public class CraftWorld implements World {
+@@ -1481,4 +1481,14 @@ public class CraftWorld implements World {
              cps.queueUnload(chunk.locX, chunk.locZ);
          }
      }

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

@@ -1,4 +1,4 @@
-From db2dbec6046f1c31ee87ae128ace8c0ffeaf30ce Mon Sep 17 00:00:00 2001
+From e028f1d959724a25798c37587be731d57f9923dd 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
@@ -26,7 +26,7 @@ index 12589d6..1d2f580 100644
      public int a(Random random) {
          return 1;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 33bbcbe..0b851a9 100644
+index 0c5f269..170b192 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -618,6 +618,7 @@ public abstract class EntityLiving extends Entity {
@@ -106,7 +106,7 @@ index 1ee65dd..79b0c43 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 2d8edf6..3f530c8 100644
+index f85bf83..10e321f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -166,6 +166,7 @@ public class CraftWorld implements World {
@@ -125,7 +125,7 @@ index 2d8edf6..3f530c8 100644
          if (safe && isChunkInUse(x, z)) {
              return false;
          }
-@@ -239,6 +241,7 @@ public class CraftWorld implements World {
+@@ -258,6 +260,7 @@ public class CraftWorld implements World {
      }
  
      public boolean loadChunk(int x, int z, boolean generate) {

CraftBukkit-Patches/0010-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 200f01125c593135d7f2989feb36dda0ef947d0f Mon Sep 17 00:00:00 2001
+From 70aedd17a9daa7fc0b33b3d3f956726a8413419e 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
@@ -124,7 +124,7 @@ index 9c17951..db78855 100644
  
      public boolean aa() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4f0098f..63cc105 100644
+index bf6216c..7695d20 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -24,6 +24,7 @@ import org.bukkit.block.BlockFace;
@@ -160,7 +160,7 @@ index 4f0098f..63cc105 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0b851a9..dc91f0a 100644
+index 170b192..5df8209 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -23,6 +23,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
@@ -172,7 +172,7 @@ index 0b851a9..dc91f0a 100644
  public abstract class EntityLiving extends Entity {
  
      private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
-@@ -1673,6 +1675,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1672,6 +1674,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void m() {
@@ -180,7 +180,7 @@ index 0b851a9..dc91f0a 100644
          super.m();
          this.cu();
          if (!this.world.isClientSide) {
-@@ -1745,7 +1748,9 @@ public abstract class EntityLiving extends Entity {
+@@ -1744,7 +1747,9 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
@@ -190,7 +190,7 @@ index 0b851a9..dc91f0a 100644
          double d0 = this.locX - this.lastX;
          double d1 = this.locZ - this.lastZ;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -1815,6 +1820,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1814,6 +1819,7 @@ public abstract class EntityLiving extends Entity {
              this.bo = 0;
          }
  
@@ -198,7 +198,7 @@ index 0b851a9..dc91f0a 100644
      }
  
      protected float h(float f, float f1) {
-@@ -1879,6 +1885,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1878,6 +1884,7 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.world.methodProfiler.a("ai");
@@ -206,7 +206,7 @@ index 0b851a9..dc91f0a 100644
          if (this.cf()) {
              this.bc = false;
              this.bd = 0.0F;
-@@ -1889,6 +1896,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1888,6 +1895,7 @@ public abstract class EntityLiving extends Entity {
              this.doTick();
              this.world.methodProfiler.b();
          }
@@ -214,7 +214,7 @@ index 0b851a9..dc91f0a 100644
  
          this.world.methodProfiler.b();
          this.world.methodProfiler.a("jump");
-@@ -1911,10 +1919,14 @@ public abstract class EntityLiving extends Entity {
+@@ -1910,10 +1918,14 @@ public abstract class EntityLiving extends Entity {
          this.be *= 0.98F;
          this.bf *= 0.9F;
          this.r();
@@ -355,10 +355,10 @@ index c226e01..d754d0d 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 49b8d3a..face946 100644
+index f813ad3..6985f31 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1246,6 +1246,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1274,6 +1274,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
     private void handleCommand(String s) {
@@ -366,7 +366,7 @@ index 49b8d3a..face946 100644
         // CraftBukkit start - whole method
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
  
-@@ -1255,18 +1256,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1283,18 +1284,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -586,10 +586,10 @@ index 91965c0..261b423 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3f530c8..ea0e108 100644
+index 10e321f..6d94f48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -252,7 +252,9 @@ public class CraftWorld implements World {
+@@ -271,7 +271,9 @@ public class CraftWorld implements World {
          net.minecraft.server.Chunk chunk = world.getChunkProviderServer().chunks.get(LongHash.toLong(x, z));
  
          if (chunk == null) {

CraftBukkit-Patches/0014-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From daa886a10a5fc3851ca4347802531ab6a5ccea5f Mon Sep 17 00:00:00 2001
+From d00c12d37558157deb7c3de4bb3931808bcac365 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
 This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 63cc105..1817e6d 100644
+index 7695d20..04dc2d1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -107,7 +107,7 @@ public abstract class Entity implements ICommandListener {
@@ -168,12 +168,12 @@ index eb0f8eb..39af5d5 100644
          // Spigot start
          double radius = world.spigotConfig.itemMerge;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index dc91f0a..36ef280 100644
+index 5df8209..e802a83 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -102,6 +102,13 @@ public abstract class EntityLiving extends Entity {
-     ArrayList<org.bukkit.inventory.ItemStack> drops;
+     ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
-      public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
+     public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
      // CraftBukkit end
 +    // Spigot start
 +    public void inactiveTick()

CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch

@@ -1,14 +1,14 @@
-From c635ff2ab88bf4514d7ec372970b866f578e833f Mon Sep 17 00:00:00 2001
+From 3f15c2bd09aa1930e107eb909eb51f19e2d44a28 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index face946..d07269e 100644
+index 6985f31..af09079 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1248,6 +1248,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1276,6 +1276,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
     private void handleCommand(String s) {
          org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
         // CraftBukkit start - whole method

CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch

@@ -1,14 +1,14 @@
-From c28c72646f1b1d468735a3800ec1825057e45584 Mon Sep 17 00:00:00 2001
+From 457934afb9df091fe09ffaea09bb104344d4ada7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d07269e..0f96a20 100644
+index af09079..1e5e543 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1409,6 +1409,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1437,6 +1437,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          if (this.player.dead) return; // CraftBukkit
          WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
          Entity entity = packetplayinuseentity.a((World) worldserver);

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

@@ -1,4 +1,4 @@
-From e2982d4921555e9bd7fa15d7c95b38253253cf5f Mon Sep 17 00:00:00 2001
+From fbed5ed5753238e7be48c5960e0f5e104f3cb2d8 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
@@ -25,10 +25,10 @@ index cd32f39..950a25a 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 36ef280..c2f5ee1 100644
+index e802a83..12d858a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1966,7 +1966,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1965,7 +1965,7 @@ public abstract class EntityLiving extends Entity {
      protected void cn() {
          List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this));
  
@@ -38,7 +38,7 @@ index 36ef280..c2f5ee1 100644
                  Entity entity = (Entity) list.get(i);
                  // TODO better check now?
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a67e0a8..91b5e2e 100644
+index b0af79b..e0f11d3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -65,6 +65,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -64,7 +64,7 @@ index a67e0a8..91b5e2e 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 64cfbe9..eea3951 100644
+index e93cedb..cdabd78 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1407,6 +1407,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

CraftBukkit-Patches/0041-Don-t-Special-Case-X-Move-Value.patch

@@ -1,11 +1,11 @@
-From 6b7a7a6b1dc6e05c2b53899a4cca7e0b9f45c682 Mon Sep 17 00:00:00 2001
+From 1983cf4f0285ec576b701c1cbc70beb1dd47d427 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 6 Oct 2013 17:36:28 +1100
 Subject: [PATCH] Don't Special Case X Move Value
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0f96a20..dda3d8c 100644
+index 1e5e543..5d70587 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -125,6 +125,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -16,7 +16,7 @@ index 0f96a20..dda3d8c 100644
  
      public CraftPlayer getPlayer() {
          return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
-@@ -325,6 +326,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -352,6 +353,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
                  // CraftBukkit start - fire PlayerMoveEvent
                  Player player = this.getPlayer();
@@ -35,7 +35,7 @@ index 0f96a20..dda3d8c 100644
                  Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
                  Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
  
-@@ -350,7 +363,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -377,7 +390,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      this.lastPitch = to.getPitch();
  
                      // Skip the first time we do this

CraftBukkit-Patches/0053-Particle-API.patch

@@ -1,4 +1,4 @@
-From fea358954f913a997260ba7b3e1e0c65910379ac Mon Sep 17 00:00:00 2001
+From bbbf61ebd7ba02c32dc530777481c57547952769 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 ea0e108..d53305e 100644
+index 6d94f48..5b18562 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -828,28 +828,18 @@ public class CraftWorld implements World {
+@@ -847,28 +847,18 @@ public class CraftWorld implements World {
              Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
          }
  
@@ -60,7 +60,7 @@ index ea0e108..d53305e 100644
      }
  
      public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
-@@ -1470,6 +1460,70 @@ public class CraftWorld implements World {
+@@ -1489,6 +1479,70 @@ public class CraftWorld implements World {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {

CraftBukkit-Patches/0055-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch

@@ -1,11 +1,11 @@
-From c7cfdc300957ebda374251b5487800eba6d437b6 Mon Sep 17 00:00:00 2001
+From 2a39802f8d846864a587def7c0d3cf2e3da8449a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5955732..eb552e2 100644
+index 1045aa2..f1d7dc5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -145,6 +145,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,10 +17,10 @@ index 5955732..eb552e2 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index ba69133..7d4bb9f 100644
+index 8351aa5..16444b6 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -626,6 +626,12 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -619,6 +619,12 @@ public abstract class EntityInsentient extends EntityLiving {
          this.world.methodProfiler.a("checkDespawn");
          this.L();
          this.world.methodProfiler.b();

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

@@ -1,4 +1,4 @@
-From d18af2a333162e83672a42442f8d303defe32290 Mon Sep 17 00:00:00 2001
+From 7ac2851b3697a50a91c97ea1dfb5f964d7eda786 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 dfe3305..bd2837c 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 29f6cff..c63f4d5 100644
+index 5b18562..c9950d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -732,12 +732,17 @@ public class CraftWorld implements World {
+@@ -751,12 +751,17 @@ public class CraftWorld implements World {
      }
  
      public void save() {

CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From c055436cae43c418f24f4238d0faa39e761c0de2 Mon Sep 17 00:00:00 2001
+From f73e433875bdfd641eb692c35fc1d2b5b0dc58ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 31 Jan 2014 11:18:34 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -7,7 +7,7 @@ Limit a single entity to colliding a max of configurable times per tick.
 This will alleviate issues where living entities are hoarded in 1x1 pens.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index eb552e2..5702cb0 100644
+index f1d7dc5..f6bec63 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener {
@@ -19,10 +19,10 @@ index eb552e2..5702cb0 100644
  
      public Entity(World world) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c2f5ee1..b410f3b 100644
+index 12d858a..0a75123 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1967,7 +1967,8 @@ public abstract class EntityLiving extends Entity {
+@@ -1966,7 +1966,8 @@ public abstract class EntityLiving extends Entity {
          List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this));
  
          if (this.isInteractable() && !list.isEmpty()) { // Spigot: Add isInteractable() condition
@@ -32,7 +32,7 @@ index c2f5ee1..b410f3b 100644
                  Entity entity = (Entity) list.get(i);
                  // TODO better check now?
                  // CraftBukkit start - Only handle mob (non-player) collisions every other tick
-@@ -1976,7 +1977,8 @@ public abstract class EntityLiving extends Entity {
+@@ -1975,7 +1976,8 @@ public abstract class EntityLiving extends Entity {
                  }
                  // CraftBukkit end
  

CraftBukkit-Patches/0071-Spam-Filter-Exclusions.patch

@@ -1,14 +1,14 @@
-From 61b8a01d655a795144a25e103d5448cd9fae18d7 Mon Sep 17 00:00:00 2001
+From 596d07ca4a9ed5b0975590981ac849eb72e57695 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 8 Feb 2014 08:13:40 +0000
 Subject: [PATCH] Spam Filter Exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dda3d8c..cf16eae 100644
+index 5d70587..31f1bbd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1154,9 +1154,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1182,9 +1182,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
              }
  

CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch

@@ -1,14 +1,14 @@
-From 3095e84c29d79ffca16bad832fc9920260045f76 Mon Sep 17 00:00:00 2001
+From b7b8bfee24d4b91a6fc4d596d270b40b13b69e68 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 18:18:01 +1100
 Subject: [PATCH] Allow Disabling Creative Item Filter
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cf16eae..117c972 100644
+index 31f1bbd..000b6b0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1916,7 +1916,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1944,7 +1944,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
              boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() <= 45;
              // CraftBukkit - Add invalidItems check

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

@@ -1,4 +1,4 @@
-From 78e5a8c00ab593f27529ee9be6793ece2c62af38 Mon Sep 17 00:00:00 2001
+From 9f7507e76b323384793e79189c84f19d5ee1c8fc 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
@@ -40,10 +40,10 @@ index 35a0bdc..e507302 100644
              // this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dc, SoundCategory.d, 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 ee4b543..66073d9 100644
+index c9950d4..1ae82e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1529,6 +1529,22 @@ public class CraftWorld implements World {
+@@ -1548,6 +1548,22 @@ public class CraftWorld implements World {
          {
              CraftWorld.this.playEffect( location, effect, 0 );
          }

CraftBukkit-Patches/0083-Descriptive-kick-reasons-instead-of-Nope.patch

@@ -1,11 +1,11 @@
-From 60ea6c076ba0abc29b8f8ad9e19b834cf1643fac Mon Sep 17 00:00:00 2001
+From 1d2e985e16567d606ce01a7519a3294dc039a4a2 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 15 Mar 2014 01:30:05 -0400
 Subject: [PATCH] Descriptive kick reasons instead of Nope!
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a3f6503..3aa0d7c 100644
+index f6bec63..6d3afd8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -258,7 +258,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,10 +27,10 @@ index a3f6503..3aa0d7c 100644
              f1 = 0;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 117c972..a82c6dd 100644
+index 000b6b0..d2b3816 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1077,7 +1077,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1105,7 +1105,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              this.player.resetIdleTimer();
          } else {
              PlayerConnection.LOGGER.warn(this.player.getName() + " tried to set an invalid carried item");

CraftBukkit-Patches/0107-Process-conversation-input-on-the-main-thread.-Fixes.patch

@@ -1,4 +1,4 @@
-From 4d40c00814e487c4df73e43710a365b045e97595 Mon Sep 17 00:00:00 2001
+From 8bed0fb6bec952d105c3ae90c39f61d63bec5f5d Mon Sep 17 00:00:00 2001
 From: riking <rikingcoding@gmail.com>
 Date: Wed, 14 May 2014 13:46:48 -0700
 Subject: [PATCH] Process conversation input on the main thread. Fixes
@@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a82c6dd..e263764 100644
+index d2b3816..7d1970c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1139,7 +1139,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1167,7 +1167,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              } else if (s.isEmpty()) {
                  LOGGER.warn(this.player.getName() + " tried to send an empty message");
              } else if (getPlayer().isConversing()) {

CraftBukkit-Patches/0112-Limit-block-placement-interaction-packets.patch

@@ -1,4 +1,4 @@
-From 76b567282192c8c32c0d05050d3c410d28888e98 Mon Sep 17 00:00:00 2001
+From 5fe1142b5408130bc6bc3a47ae15ddcb32355ad3 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets
@@ -41,10 +41,10 @@ index cb0356e..0000000
 -    }
 -}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e263764..9e9dfb2 100644
+index 7d1970c..5217c1c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -862,6 +862,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -890,6 +890,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      }
  
@@ -55,7 +55,7 @@ index e263764..9e9dfb2 100644
      public void a(PacketPlayInBlockPlace packetplayinblockplace) {
          PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.x());
          if (this.player.dead) return; // CraftBukkit
-@@ -870,7 +874,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -898,7 +902,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          ItemStack itemstack = this.player.b(enumhand);
  
          this.player.resetIdleTimer();

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

@@ -1,4 +1,4 @@
-From 3231bb87a8c52c07b52f2ae1c8afa5ebadb6fbb8 Mon Sep 17 00:00:00 2001
+From 3f5ed9251204c045f3e95dc1f70df0e73c1bfb10 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 06ace47..f74d1b9 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 2b3569d..c0d7ac5 100644
+index 1ae82e7..b06f167 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1107,6 +1107,12 @@ public class CraftWorld implements World {
+@@ -1126,6 +1126,12 @@ public class CraftWorld implements World {
          }
  
          if (entity != null) {

CraftBukkit-Patches/0146-Clear-Packet-Queue-on-Disconnect.patch

@@ -1,4 +1,4 @@
-From 3cb25e3086787fcf55e23d5bc8239e2aafdcbf98 Mon Sep 17 00:00:00 2001
+From fba2f6ee2a40f41132372e125ec3086fa613c5fb Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 22 Jul 2015 19:04:37 +1000
 Subject: [PATCH] Clear Packet Queue on Disconnect
@@ -17,10 +17,10 @@ index 4c6dfb1..a9ea3f5 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9e9dfb2..e711f75 100644
+index 5217c1c..99707f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1048,7 +1048,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1076,7 +1076,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          // CraftBukkit start