Add MCUtils helper

This will be used by my next commit. But trying to get the build going
since CI blew up

Spigot-Server-Patches/0004-MC-Utils.patch

@@ -0,0 +1,125 @@
+From d7343318730a1a96448116c422161127a8bc0600 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 28 Mar 2016 20:55:47 -0400
+Subject: [PATCH] MC Utils
+
+Collection of utils to help reduce NMS diff
+
+diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
+new file mode 100644
+index 0000000..f76fd44
+--- /dev/null
++++ b/src/main/java/net/minecraft/server/MCUtil.java
+@@ -0,0 +1,109 @@
++package net.minecraft.server;
++
++import org.bukkit.Location;
++
++import java.util.regex.Pattern;
++
++public class MCUtil {
++    private static final Pattern REPLACE_QUOTES = Pattern.compile("\"");
++
++    private MCUtil() {}
++
++
++    /**
++     * Builds a chat componenent from a string.
++     * @param str
++     * @return
++     */
++    public static IChatBaseComponent cmpFromMessage(String str) {
++        return IChatBaseComponent.ChatSerializer.a("{text:\"" + REPLACE_QUOTES.matcher(str).replaceAll("\\\"") + "\"}");
++    }
++
++    /**
++     * Calculates distance between 2 entities
++     * @param e1
++     * @param e2
++     * @return
++     */
++    public static double distance(Entity e1, Entity e2) {
++        return Math.sqrt(distanceSq(e1, e2));
++    }
++
++
++    /**
++     * Calculates distance between 2 block positions
++     * @param e1
++     * @param e2
++     * @return
++     */
++    public static double distance(BlockPosition e1, BlockPosition e2) {
++        return Math.sqrt(distanceSq(e1, e2));
++    }
++
++    /**
++     * Gets the distance between 2 positions
++     * @param x1
++     * @param y1
++     * @param z1
++     * @param x2
++     * @param y2
++     * @param z2
++     * @return
++     */
++    public static double distance(double x1, double y1, double z1, double x2, double y2, double z2) {
++        return Math.sqrt(distanceSq(x1, y1, z1, x2, y2, z2));
++    }
++
++    /**
++     * Get's the distance squared between 2 entities
++     * @param e1
++     * @param e2
++     * @return
++     */
++    public static double distanceSq(Entity e1, Entity e2) {
++        return distanceSq(e1.locX,e1.locY,e1.locZ, e2.locX,e2.locY,e2.locZ);
++    }
++
++    /**
++     * Gets the distance sqaured between 2 block positions
++     * @param pos1
++     * @param pos2
++     * @return
++     */
++    public static double distanceSq(BlockPosition pos1, BlockPosition pos2) {
++        return distanceSq(pos1.getX(), pos1.getY(), pos1.getZ(), pos2.getX(), pos2.getY(), pos2.getZ());
++    }
++
++    /**
++     * Gets the distance squared between 2 positions
++     * @param x1
++     * @param y1
++     * @param z1
++     * @param x2
++     * @param y2
++     * @param z2
++     * @return
++     */
++    public static double distanceSq(double x1, double y1, double z1, double x2, double y2, double z2) {
++        return (x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2) + (z1 - z2) * (z1 - z2);
++    }
++
++    /**
++     * Converts a NMS World/BlockPosition to Bukkit Location
++     * @param world
++     * @param pos
++     * @return
++     */
++    public static Location toLocation(World world, BlockPosition pos) {
++        return new Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ());
++    }
++
++    /**
++     * Converts an NMS entity's current location to a Bukkit Location
++     * @param entity
++     * @return
++     */
++    public static Location toLocation(Entity entity) {
++        return new Location(entity.getWorld().getWorld(), entity.locX, entity.locY, entity.locZ);
++    }
++}
+-- 
+2.7.4
+

Spigot-Server-Patches/0005-Timings-v2.patch

@@ -1,4 +1,4 @@
-From bb46ae1ec8983a4caad91253f7216514c901ee1b Mon Sep 17 00:00:00 2001
+From 021b726e4f01b94cb7e0f19ff0feaa1386f5e010 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2

Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch

@@ -1,4 +1,4 @@
-From fc3db01074dfbe35fe255ebeaffe22a51224f764 Mon Sep 17 00:00:00 2001
+From 985d47dbf4c2334eb94567cad6fca09c5ede38e3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:20:21 -0600
 Subject: [PATCH] Vanished players don't have rights

Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch

@@ -1,4 +1,4 @@
-From 825f03c5427faf4c8e0275347dacacb47ab28179 Mon Sep 17 00:00:00 2001
+From 39ea4e339a937f8079827d3b9a46e00afae5f4c0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 12:45:11 -0600
 Subject: [PATCH] Configurable squid spawn ranges
@@ -36,5 +36,5 @@ index b94444d..9f1a50e 100644
  
      public void b(float f, float f1, float f2) {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch

@@ -1,4 +1,4 @@
-From 8fdb8ce2c7e89fe02d216c7c46050b1aac7b3e1d Mon Sep 17 00:00:00 2001
+From b0e638701232329aa46911cab5cfdc6d484605a0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:02:51 -0600
 Subject: [PATCH] Configurable cactus and reed natural growth heights

Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch

@@ -1,4 +1,4 @@
-From e07edfc97c5954defffb72b7428aff66728f42e1 Mon Sep 17 00:00:00 2001
+From 078cefa411dcb2cbc5b722781ae0af2548261f80 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:09:16 -0600
 Subject: [PATCH] Configurable baby zombie movement speed
@@ -45,5 +45,5 @@ index e7be27a..949452c 100644
          }
  
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch

@@ -1,4 +1,4 @@
-From 74b3e206a6c07d63568ce22c3496ffda39d31c08 Mon Sep 17 00:00:00 2001
+From 5d63e7d32e8fd136134d6e07f97b34da19e03b9d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:14:11 -0600
 Subject: [PATCH] Configurable fishing time ranges
@@ -35,5 +35,5 @@ index 140df3a..b99d9c4 100644
                          }
                      }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch

@@ -1,4 +1,4 @@
-From 14348d76f408cfeac5e3a113203bd430042cbf0d Mon Sep 17 00:00:00 2001
+From 8ee73bd6f2efd593b1dab427d9ed13e034c00f73 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump
@@ -56,5 +56,5 @@ index 1a20dbf..c56a0d0 100644
          ((Navigation) entityinsentient.getNavigation()).c(true);
      }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch

@@ -1,4 +1,4 @@
-From b3ec2e2d2be0d461b657c45f7adb14aa4fe6edb0 Mon Sep 17 00:00:00 2001
+From 6a41507aeb1e0942a0d347bbdb8500d3b38356df Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:31:05 -0600
 Subject: [PATCH] Toggle for player interact limiter
@@ -22,7 +22,7 @@ index 7cfe3b9..f0ed051 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 38a3abb..80ed7f8 100644
+index cd19408..b351f2b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -913,7 +913,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -36,5 +36,5 @@ index 38a3abb..80ed7f8 100644
          } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 )
          {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch

@@ -1,4 +1,4 @@
-From a289c8985b7dfb59cc21e064a1e1a01c5cde7be4 Mon Sep 17 00:00:00 2001
+From f0625a47f413e8273fc06aab8a6dacc7031dd6da Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Tue, 1 Mar 2016 13:43:16 -0600
 Subject: [PATCH] Player Exhaustion Multipliers

Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch

@@ -1,4 +1,4 @@
-From afec596383cad835b1fe6911dda53f3f9158f83c Mon Sep 17 00:00:00 2001
+From 176621ca524f307f1b7620ef2b54ab3d10cbe7f9 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities
@@ -51,5 +51,5 @@ index cee3b4a..fdda1ae 100644
                  }
              }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch

@@ -1,4 +1,4 @@
-From c91aedbaf3ee5edaa06db45c1a0eccea3a9e0fde Mon Sep 17 00:00:00 2001
+From 3928ed004ee94d72443934868f5a055241c01f27 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 03:53:43 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks
@@ -20,7 +20,7 @@ index f9da7f8..f9a58f9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index acf7ad8..378d71b 100644
+index b26516a..5524e43 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -198,6 +198,7 @@ public abstract class World implements IBlockAccess {
@@ -32,5 +32,5 @@ index acf7ad8..378d71b 100644
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -1,4 +1,4 @@
-From 4d4cbab0fa5a41955f0c31cbcdfe35a4756b2daa Mon Sep 17 00:00:00 2001
+From 0d17591b964a7dfac11699bb71e8f7e4f075696f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
@@ -64,5 +64,5 @@ index 35ed2a6..564ea37 100644
          this.motY *= 0.9800000190734863D;
          this.motZ *= 0.9800000190734863D;
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch

@@ -1,4 +1,4 @@
-From c24baf1beff606ebad8e896feb3a0e7d889a6b11 Mon Sep 17 00:00:00 2001
+From 37850ea6d29505f59ae31c0e27b286baa36a5afe Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:27:13 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
@@ -57,5 +57,5 @@ index 800ffdc..036e861 100644
 +    }
  }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -1,4 +1,4 @@
-From 0f1666a5efea7793eabce61f590cfdd2a70e906e Mon Sep 17 00:00:00 2001
+From 0777499c5b969bd7241f6872ed59200d5ca6835a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -20,7 +20,7 @@ index c872029..fac5f88 100644
              EULA.a.warn("Failed to save " + this.b, exception);
          } finally {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ceb5bcc..81c1246 100644
+index eac4e79..d901d2c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1024,7 +1024,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -33,7 +33,7 @@ index ceb5bcc..81c1246 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fbfb2ab..ebee7ee 100644
+index 3f27fe6..52155e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -130,7 +130,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
@@ -80,5 +80,5 @@ index 94a3d42..3ed983c 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0019-Player-affects-spawning-API.patch

@@ -1,4 +1,4 @@
-From c01e23fb95c1ae0579eeb1a8082110b891210ad6 Mon Sep 17 00:00:00 2001
+From eb8ba651ad60e2edc9ef0d68d7204434351acc9b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API

Spigot-Server-Patches/0020-Metrics.patch

@@ -1,4 +1,4 @@
-From 825d0c39c3b0145235aacb25a04fbf3e8cbe2486 Mon Sep 17 00:00:00 2001
+From a5b335a3eccdd958fa29427010f9ef8a2e1d1639 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:54:32 -0600
 Subject: [PATCH] Metrics
@@ -18,5 +18,5 @@ index a5fd59d..680283c 100644
          String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
          String serverVersion = Bukkit.getVersion();
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch

@@ -1,4 +1,4 @@
-From deaf1ebb7ff5834a231f743ad1b0ed66a3dac727 Mon Sep 17 00:00:00 2001
+From be23fa2011288fc9a21363c2bc5d43400763bff0 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 15:08:03 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
@@ -20,5 +20,5 @@ index 3c67d36..cde4124 100644
              System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
                  + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!");
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch

@@ -1,4 +1,4 @@
-From 2cebd0ced2df69501ec09ec55788bcc160feac17 Mon Sep 17 00:00:00 2001
+From 97671c73d297bf6f9938d518d162b9323c1482ae Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 22:01:19 -0600
 Subject: [PATCH] Optimize TileEntity Ticking

Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch

@@ -1,4 +1,4 @@
-From 44424f7123cadb3774379d741192c9bef237146d Mon Sep 17 00:00:00 2001
+From 39a2b68881f6f6a9de18ce84c77288124e004925 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop

Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch

@@ -1,11 +1,11 @@
-From 9e5d6a42c2719a969ca6adaf1178fe8409a84b83 Mon Sep 17 00:00:00 2001
+From 13bbada8c20eff21947344b3d5fac69bb7cc521f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4bf9c71..5ae6fe9 100644
+index 3203458..8370d94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1133,12 +1133,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -24,5 +24,5 @@ index 4bf9c71..5ae6fe9 100644
  
      @Override
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0025-Add-async-chunk-load-API.patch

@@ -1,4 +1,4 @@
-From bc84d38e17b35e5440507c460282c18082bc635b Mon Sep 17 00:00:00 2001
+From 6c60d9170e309cb01828a57ab43013fca7fb98d7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:19:01 -0600
 Subject: [PATCH] Add async chunk load API
@@ -36,5 +36,5 @@ index 7b2c289..83e3003 100644
          return this.world.getChunkProviderServer().getOrCreateChunkFast(x, z).bukkitChunk;
      }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0026-Entity-Origin-API.patch

@@ -1,4 +1,4 @@
-From 9c492d248b8874afb059dab31a72ea0a0a88d2b5 Mon Sep 17 00:00:00 2001
+From 7c3d5f7af8f54b7c9862855660aa765dd93a28ca Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -81,7 +81,7 @@ index 564ea37..1113b1c 100644
  
      public EntityLiving getSource() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9124558..18d0bd8 100644
+index 0460dc5..87236e8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -948,6 +948,12 @@ public abstract class World implements IBlockAccess {

Spigot-Server-Patches/0027-Prevent-tile-entity-and-entity-crashes.patch

@@ -1,4 +1,4 @@
-From d246c4ba59d08a38f15f8b13d1146971b8585848 Mon Sep 17 00:00:00 2001
+From c38899ff17304f5a6e10ac12f100d4b05efd4b02 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes

Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch

@@ -1,4 +1,4 @@
-From 10b350b444bd8faa19ee78120ee98a263604e561 Mon Sep 17 00:00:00 2001
+From 03c404597d6f991e3d0efe86410ba1ae26622b18 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
@@ -20,7 +20,7 @@ index f81ece3..7c0e61f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index eaaca75..00ea730 100644
+index 7152182..96014a9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -301,6 +301,13 @@ public abstract class Entity implements ICommandListener {
@@ -47,5 +47,5 @@ index eaaca75..00ea730 100644
          }
  
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0029-Check-online-mode-before-converting-and-renaming-pla.patch

@@ -1,4 +1,4 @@
-From 38d2b8999bf419f900258c3de53a9cb706f76403 Mon Sep 17 00:00:00 2001
+From 534ef829ced9cd8f7b2a291cd88fc681c14e390a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
@@ -18,5 +18,5 @@ index df82c14..c2d384c 100644
                  file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                  if ( file.exists() )
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0030-Fix-redstone-lag-issues.patch

@@ -1,4 +1,4 @@
-From 170763c83dc747710baa43a11abbd20bdc44f940 Mon Sep 17 00:00:00 2001
+From 2ca3862b9d997a97f44d1bdca8b36f8dc1f8f1ff Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:21:24 -0600
 Subject: [PATCH] Fix redstone lag issues
@@ -75,5 +75,5 @@ index 10e06d6..e2a7187 100644
                  this.methodProfiler.a("ticking");
                  timings.scheduledBlocksTicking.startTiming(); // Paper
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0031-Always-tick-falling-blocks.patch

@@ -1,4 +1,4 @@
-From bb754c6c3974b256f86050fecba001bca5c38d30 Mon Sep 17 00:00:00 2001
+From c45b5e15b8442fbfd975903c63da1792fa032739 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
 Subject: [PATCH] Always tick falling blocks
@@ -25,5 +25,5 @@ index 0b057fa..f0d3a19 100644
                  || entity instanceof EntityFireworks )
          {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0032-Lighting-Queue.patch

@@ -1,4 +1,4 @@
-From d438c0dfa1b5b31fbb7c65e5b8675824847f541b Mon Sep 17 00:00:00 2001
+From fedb4489139be404ed7916f2ea5223241b561187 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -206,7 +206,7 @@ index e9bb02f..d0fd638 100644
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f564b1a..cdb722d 100644
+index f8746b3..a6d4097 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -378,7 +378,17 @@ public abstract class World implements IBlockAccess {
@@ -229,5 +229,5 @@ index f564b1a..cdb722d 100644
                  }
  
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0033-Optimize-draining.patch

@@ -1,4 +1,4 @@
-From 933cc8c6250818d3e03af94f5f6ea55da1f8b9d3 Mon Sep 17 00:00:00 2001
+From e85b4d19d220e6b663b4a518597ff7cf77831e80 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:55:24 -0600
 Subject: [PATCH] Optimize draining
@@ -24,5 +24,5 @@ index 036e861..f35f30c 100644
              }
          } else {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0034-Configurable-end-credits.patch

@@ -1,4 +1,4 @@
-From fa94c2db66e9f3505e95e813ef9282fc287d404a Mon Sep 17 00:00:00 2001
+From 1c44a3a34312691c21a43b92620d81bacab17113 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits

Spigot-Server-Patches/0035-Fix-lag-from-explosions-processing-dead-entities.patch

@@ -1,4 +1,4 @@
-From 0fa4103cbc24543b8079439248771447adb35a7d Mon Sep 17 00:00:00 2001
+From cf462e484f0ad41d7f87d13cfe63cd2b44a2c135 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
@@ -25,5 +25,5 @@ index 3234511..8ce1b23 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0036-Generator-Settings.patch

@@ -1,11 +1,11 @@
-From c22fe7b79d125ef1c0d329159702ab9977bdd48e Mon Sep 17 00:00:00 2001
+From d76297a44be358054075f915a50480c1be1d06a2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1b88731..7154d31 100644
+index 3a57c8e..66deccb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -177,4 +177,28 @@ public class PaperWorldConfig {
@@ -265,5 +265,5 @@ index 22d96e9..83d9509 100644
          Iterator iterator = this.c.values().iterator();
  
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0037-Optimize-explosions.patch

@@ -1,4 +1,4 @@
-From abf2b31e23d05c3fb8ec5b85f739356b48047979 Mon Sep 17 00:00:00 2001
+From 6d08aaefa976503ede51306afe7d8f85e17429b0 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -124,7 +124,7 @@ index 8ce1b23..5bb2510 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aa337cc..a30b019 100644
+index d0fd638..5076aa3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -900,6 +900,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -136,7 +136,7 @@ index aa337cc..a30b019 100644
  
              // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a1d8bc5..3fe987f 100644
+index a6d4097..c0f0b83 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -15,6 +15,7 @@ import java.util.concurrent.Callable;
@@ -156,5 +156,5 @@ index a1d8bc5..3fe987f 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0038-Stop-updating-flowing-block-if-material-has-changed.patch

@@ -1,4 +1,4 @@
-From 51d80ce6ec7ea8db6e9197d43e1d8d793aea50f0 Mon Sep 17 00:00:00 2001
+From a3368ae0995a5ee4474ff5734c922d6c8f1cb3ca Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 12:03:23 -0600
 Subject: [PATCH] Stop updating flowing block if material has changed
@@ -17,5 +17,5 @@ index f35f30c..1f07f82 100644
  
          if (this.h(world, blockposition.down(), iblockdata2)) {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0039-Fast-draining.patch

@@ -1,11 +1,11 @@
-From bee35809ed6952840478cdfdfaa57154f1ab592b Mon Sep 17 00:00:00 2001
+From c9e4fbbe1ceced99a47e76c5f7bcaad14d094d6e Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:20:52 -0600
 Subject: [PATCH] Fast draining
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2be15d2..dcf3d74 100644
+index 09b9867..658e430 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -207,4 +207,11 @@ public class PaperWorldConfig {
@@ -96,5 +96,5 @@ index 1f07f82..517c1e8 100644
 +    }
  }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0040-Configurable-lava-flow-speed.patch

@@ -1,11 +1,11 @@
-From aed422378183ad50ddcf167ce96c9f9ffad482a3 Mon Sep 17 00:00:00 2001
+From ebbe7bc51b8020a58c466053febcdcbe10211fed Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dcf3d74..78a1e59 100644
+index 658e430..095f3b6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -214,4 +214,11 @@ public class PaperWorldConfig {
@@ -35,5 +35,5 @@ index 517c1e8..51b80cb 100644
                  world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
                          world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0041-Add-player-view-distance-API.patch

@@ -1,4 +1,4 @@
-From e4208537faca7d7cfacd8f03c0e5230962f9179d Mon Sep 17 00:00:00 2001
+From 94b4dc473c08c9903cc6a49e9bb742ce97dbef9f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API

Spigot-Server-Patches/0042-Disable-explosion-knockback.patch

@@ -1,4 +1,4 @@
-From 3af943e6034e05afb56355211d24a9fe2c9c994c Mon Sep 17 00:00:00 2001
+From 6b3da1239ae323d5dcae1c59d86156fe471fe27b Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback

Spigot-Server-Patches/0043-Disable-thunder.patch

@@ -1,11 +1,11 @@
-From dd9fa935272cef1509b649a54ed2cdd2c5b6d67a Mon Sep 17 00:00:00 2001
+From 5491f2f781884e632797d341eb903226e831f478 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6fce2b3..ea9043a 100644
+index 491a8a7..a665e3a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -226,4 +226,9 @@ public class PaperWorldConfig {
@@ -33,5 +33,5 @@ index e2a7187..f87cd59 100644
                      l = this.l >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0044-Disable-ice-and-snow.patch

@@ -1,11 +1,11 @@
-From 25ec33d536c971e77d42e84f5181011a899953f2 Mon Sep 17 00:00:00 2001
+From 34b52524c899c87cd5e2a581f5fbe793d4e07e39 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ea9043a..8b7028a 100644
+index a665e3a..41b2a42 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -231,4 +231,9 @@ public class PaperWorldConfig {
@@ -32,5 +32,5 @@ index f87cd59..0e1cbfe 100644
                      l = this.l >> 2;
                      blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0045-Configurable-mob-spawner-tick-rate.patch

@@ -1,11 +1,11 @@
-From 203010e75b3dff113704ca77beee60080ce44fdf Mon Sep 17 00:00:00 2001
+From 4ae728fd4fbe6c9d9a314f61bed525ae6c16163d Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8b7028a..5efba80 100644
+index 41b2a42..1236128 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -236,4 +236,9 @@ public class PaperWorldConfig {
@@ -64,5 +64,5 @@ index 2eee845..f4f77d7 100644
                  }
  
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0046-Configurable-TNT-cannon-fix.patch

@@ -1,4 +1,4 @@
-From af956966919135aa17834ffb544bbb26b999edaf Mon Sep 17 00:00:00 2001
+From b54bda97dbbe9c013c860bb721c8fc836486b243 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:00:53 -0600
 Subject: [PATCH] Configurable TNT cannon fix
@@ -315,5 +315,5 @@ index 418ee29..9b86454 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0047-Send-absolute-position-the-first-time-an-entity-is-s.patch

@@ -1,4 +1,4 @@
-From b0d2afb9b255b477e3b9a02cb0a3cf8391d3583f Mon Sep 17 00:00:00 2001
+From f953ad5cc6a322d6486ad2003f90ba92f51ba368 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
@@ -93,5 +93,5 @@ index f8570a8..1602dff 100644
  
                      entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0048-Add-BeaconEffectEvent.patch

@@ -1,4 +1,4 @@
-From 6048ce7605f4394ff71a8355d6903a1d32ee3c3d Mon Sep 17 00:00:00 2001
+From 0f460eada64a1fa1d012d8310f9eccec0feaa0d1 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -61,5 +61,5 @@ index ed5b374..048f5bb 100644
              }
          }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0049-Configurable-container-update-tick-rate.patch

@@ -1,4 +1,4 @@
-From c945db505af96a5c252515ac904218fabbce5f58 Mon Sep 17 00:00:00 2001
+From 6ccc58fffcabd1eb401162d3f524ad539964f177 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate

Spigot-Server-Patches/0050-Fix-lava-water-some-times-creating-air-instead-of-co.patch

@@ -1,4 +1,4 @@
-From 456394786a5214ac55eb69b4deb8e28e53338011 Mon Sep 17 00:00:00 2001
+From 373eef295a46206b41b22b4cb6631d0f3d2c98a9 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:38:52 -0600
 Subject: [PATCH] Fix lava/water some times creating air instead of cobblestone
@@ -18,5 +18,5 @@ index 675cdc0..8c23ce3 100644
                      this.fizz(world, blockposition);
                      return true;
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0051-Use-UserCache-for-player-heads.patch

@@ -1,4 +1,4 @@
-From 741c96922f4a490d642998d194c2f4ef10309f3c Mon Sep 17 00:00:00 2001
+From da2863df4fb017aff9677682fb316da7a3348b3f Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
@@ -32,5 +32,5 @@ index 2abca0c..7d83bbe 100644
  
          return true;
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0052-Disable-spigot-tick-limiters.patch

@@ -1,4 +1,4 @@
-From 3056085331bf477adf8ae5e6ae6065562f528115 Mon Sep 17 00:00:00 2001
+From c303f2f17f0a9bde32a41118a0d5831e0d071de1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters

Spigot-Server-Patches/0053-Configurable-Chunk-IO-Thread-Base-Count.patch

@@ -1,4 +1,4 @@
-From 55de85f3cfa0c878dfd3e4e488152930021e3184 Mon Sep 17 00:00:00 2001
+From 597ee1c40918eefe854dbc41d38f9cf305a78d98 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
@@ -39,5 +39,5 @@ index e4fd9bc..7b7a3d0 100644
  
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0054-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch

@@ -1,4 +1,4 @@
-From ca7f6b39251f2e5288ef8d60353daf0ecbb25a5e Mon Sep 17 00:00:00 2001
+From 47f34049305ac72e737769f0e6b7c00bccd40b5f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:51:51 -0600
 Subject: [PATCH] Don't create Region File's when checking if chunk exists
@@ -49,5 +49,5 @@ index 5528019..01a08d4 100644
                  file1.mkdirs();
              }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0055-Don-t-create-a-chunk-just-to-unload-it.patch

@@ -1,11 +1,11 @@
-From 251cc68a70be8ecf8f056adb8cc90adfafaca86e Mon Sep 17 00:00:00 2001
+From 4aafe0f081ad7097a066c0cc28c6a36706a4302f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:55:20 -0600
 Subject: [PATCH] Don't create a chunk just to unload it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 25edfb8..c51c74b 100644
+index 83e3003..3f2d83a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -205,7 +205,12 @@ public class CraftWorld implements World {
@@ -23,5 +23,5 @@ index 25edfb8..c51c74b 100644
              save = true;
          }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0056-EAR-Fix-bug-with-teleporting-entities.patch

@@ -1,4 +1,4 @@
-From a8c6c72e3f2ba1560959421b0d2375fbd9f82f42 Mon Sep 17 00:00:00 2001
+From df57dc656157c2df692858b66b253575232f2a68 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 00:07:23 -0600
 Subject: [PATCH] EAR: Fix bug with teleporting entities
@@ -7,7 +7,7 @@ Subject: [PATCH] EAR: Fix bug with teleporting entities
 https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/pull-requests/52/overview
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 018da0f..38bc9c0 100644
+index 96014a9..c99b402 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -119,9 +119,17 @@ public abstract class Entity implements ICommandListener {
@@ -45,5 +45,5 @@ index f0d3a19..a1bd1a6 100644
          }
  
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0057-Add-PlayerInitialSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 89d808a64409fe199f0cda9e3ef0163805a4bfc6 Mon Sep 17 00:00:00 2001
+From f17ded80e85aec1519ed04ee5992f0ad4426abd8 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent

Spigot-Server-Patches/0058-Process-Entity-Chunk-Registration-on-Teleport.patch

@@ -1,4 +1,4 @@
-From 89b96e5996cd6fc49c4abe5e11a78d1ea8aebe84 Mon Sep 17 00:00:00 2001
+From f6e2e87141988fcc4c191ef0cc75e30c4fa87398 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 00:12:23 -0600
 Subject: [PATCH] Process Entity Chunk Registration on Teleport
@@ -6,7 +6,7 @@ Subject: [PATCH] Process Entity Chunk Registration on Teleport
 Fixes many issues with entities not being properly "switched" to their new chunk on teleport
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 3b29578..6fdfee6 100644
+index f4168c4..b422b75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -242,6 +242,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -18,5 +18,5 @@ index 3b29578..6fdfee6 100644
          return true;
      }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0059-Disable-chest-cat-detection.patch

@@ -1,11 +1,11 @@
-From d823b6d2a8148198d203cc315f2b2cba153e9f4b Mon Sep 17 00:00:00 2001
+From bb0773bf6b5ee21d8bc8be6f66227fa59ef8335c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a4d9b16..4911060 100644
+index 91eb5de..d5a1c47 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -252,4 +252,9 @@ public class PaperWorldConfig {
@@ -35,5 +35,5 @@ index 7d27317..ed8d1df 100644
  
          EntityOcelot entityocelot;
 -- 
-2.7.3
+2.7.4
 

Spigot-Server-Patches/0060-Ensure-commands-are-not-ran-async.patch

@@ -1,4 +1,4 @@
-From 4c48d661bf7df939a235d2008af4b473cfb86b39 Mon Sep 17 00:00:00 2001
+From e926a4a0baf7c0878c2111f9f037fd535439102d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 80ed7f8..27f78ab 100644
+index b351f2b..50fcc7c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1265,6 +1265,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -48,7 +48,7 @@ index 80ed7f8..27f78ab 100644
          } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b27d95a..5a24d38 100644
+index 14e5647..c6cee80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -642,6 +642,29 @@ public final class CraftServer implements Server {
@@ -82,5 +82,5 @@ index b27d95a..5a24d38 100644
              return true;
          }
 -- 
-2.7.2
+2.7.4
 

Spigot-Server-Patches/0061-All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -1,11 +1,11 @@
-From 7bb145b09d9c6ba49a92b4c39d6d9bc422ee167d Mon Sep 17 00:00:00 2001
+From aa27334c54ae835db3bad51791bc5fada2bcf653 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4911060..8ec65af 100644
+index d5a1c47..1f97e59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -257,4 +257,9 @@ public class PaperWorldConfig {
@@ -33,5 +33,5 @@ index cb92686..645082d 100644
                  }
              }
 -- 
-2.7.3
+2.7.4
 

Spigot-Server-Patches/0062-Add-Location-support-to-tab-completers-vanilla-featu.patch

@@ -1,4 +1,4 @@
-From fcf90d0153ab06175704b06e7e439750b96d2869 Mon Sep 17 00:00:00 2001
+From 9400db7c1dfd50bcaa073c27eac23ca6bcd68242 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Thu, 3 Mar 2016 01:44:39 -0600
 Subject: [PATCH] Add Location support to tab completers (vanilla feature

Spigot-Server-Patches/0063-Made-EntityDismountEvent-Cancellable.patch

@@ -1,11 +1,11 @@
-From d0210b26c5be480045aca3b84d89b62f6797e372 Mon Sep 17 00:00:00 2001
+From 172117c0ef004434c7568f0bad02ebdf77390e48 Mon Sep 17 00:00:00 2001
 From: Nik Gil <nikmanG@users.noreply.github.com>
 Date: Thu, 3 Mar 2016 04:04:19 -0600
 Subject: [PATCH] Made EntityDismountEvent Cancellable
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 919766c..730d864 100644
+index c99b402..cc345d9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -38,6 +38,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -29,5 +29,5 @@ index 919766c..730d864 100644
              entity.j = 60;
          }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0064-Optimize-Pathfinding.patch

@@ -1,4 +1,4 @@
-From 91c5270071363c7ecd1366749af6a052545ad1ff Mon Sep 17 00:00:00 2001
+From 720d59b0a5a83d3b047cd43e23ae149d284dc0db Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as
 arrow attacks.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 2f4265a..7d794b9 100644
+index 7cfe0af..9687785 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -118,10 +118,26 @@ public abstract class NavigationAbstract {
@@ -47,5 +47,5 @@ index 2f4265a..7d794b9 100644
      }
  
 -- 
-2.7.2
+2.7.4
 

Spigot-Server-Patches/0065-Optimize-getBlockData.patch

@@ -1,4 +1,4 @@
-From 913ffd56eaf018ef08a5581bdb34cf4e98d9327e Mon Sep 17 00:00:00 2001
+From 5a12cc3597b9adaa7c33ca1a9a31da1b61e3ac4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize getBlockData
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize getBlockData
 Hot method, so reduce # of instructions for the method.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9020b1b..f233c13 100644
+index 3b5e8c2..42fedb7 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -403,8 +403,15 @@ public class Chunk {
@@ -27,5 +27,5 @@ index 9020b1b..f233c13 100644
  
      public IBlockData a(final int i, final int j, final int k) {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0066-Avoid-hopper-searches-if-there-are-no-items.patch

@@ -1,4 +1,4 @@
-From 88409e2d479cf1860508674d0329802571bc1ac1 Mon Sep 17 00:00:00 2001
+From c0a13468860520d04911b27b40c3f733606f380f Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -95,5 +95,5 @@ index 42fedb7..806e499 100644
  
              while (iterator.hasNext()) {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0067-Expose-server-CommandMap.patch

@@ -1,4 +1,4 @@
-From 81735e45cd45e6dfecd4012238991f8e920c1727 Mon Sep 17 00:00:00 2001
+From 8483263baf5476af87b6de9e8102df77142b10b2 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap

Spigot-Server-Patches/0068-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -1,11 +1,11 @@
-From 26480c5baebe4a6567d60581907652d49bf199aa Mon Sep 17 00:00:00 2001
+From 46667c660cf72a61bf80b4fc4c2c62d8f1308596 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index ad3917d..6f25d18 100644
+index 8aa8686..aed3e4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -92,7 +92,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -21,5 +21,5 @@ index ad3917d..6f25d18 100644
  
          if (entity instanceof EntityPlayer && health == 0) {
 -- 
-2.7.2
+2.7.4
 

Spigot-Server-Patches/0069-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From 82df621abfd19841957920d11a85c01578fe37f5 Mon Sep 17 00:00:00 2001
+From cb036e63381da8aa3fa178df3ad52a4f4fafb1dc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 02:21:58 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses

Spigot-Server-Patches/0070-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From 3848a164a9d9104e7ce02e44990be9f93dd89f6b Mon Sep 17 00:00:00 2001
+From da041e745dfb77377be5f5675e35a86c048253b6 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs

Spigot-Server-Patches/0071-Ensure-inv-drag-is-in-bounds.patch

@@ -1,4 +1,4 @@
-From 3d18173ece90994e98f666ca2a2d7cfc60165fbe Mon Sep 17 00:00:00 2001
+From d753f184ac224ba3df89980d37f5fd099be26a30 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
@@ -18,5 +18,5 @@ index 000b4db..e72eac4 100644
          return slot != null ? slot.getItem() : null;
      }
 -- 
-2.7.2
+2.7.4
 

Spigot-Server-Patches/0072-Change-implementation-of-tile-entity-removal-list.patch

@@ -1,4 +1,4 @@
-From 991755c40444df0dfd334947be578d6591f7dbcf Mon Sep 17 00:00:00 2001
+From faf5c9a69d1d8376d97f1d955ef4a1e362b00098 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list

Spigot-Server-Patches/0073-Add-configurable-portal-search-radius.patch

@@ -1,11 +1,11 @@
-From c6fb8f63240d3ee1457c3c31a041b50df8cab965 Mon Sep 17 00:00:00 2001
+From b7f01f493caaf13f0e3f207253154f875c11d7d0 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fd9aa5c..904d9a8 100644
+index ca11cd7..c245599 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -267,4 +267,9 @@ public class PaperWorldConfig {
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.7.3
+2.7.4
 

Spigot-Server-Patches/0074-Add-velocity-warnings.patch

@@ -1,11 +1,11 @@
-From 4fe15e0c20e1d2d49ea0af87c3401825deae634a Mon Sep 17 00:00:00 2001
+From 7865b56d5163b97ccc38977c35d533c2406c5827 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 6fdfee6..5f1ebfa 100644
+index b422b75..d24b81b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -204,6 +204,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

Spigot-Server-Patches/0075-Fix-inter-world-teleportation-glitches.patch

@@ -1,4 +1,4 @@
-From 1aee9c338934ea6f0187ff0e4141929f27fd9d91 Mon Sep 17 00:00:00 2001
+From 9498346a722c19b0d8b45ac0cb712a34c1e7a3bf Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -11,7 +11,7 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
 The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 904d9a8..7b5b2d3 100644
+index c245599..75b22fa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -272,4 +272,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index 904d9a8..7b5b2d3 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0c2d2c6..4be2653 100644
+index 609f7ea..2f86dd3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -553,7 +553,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -39,5 +39,5 @@ index 0c2d2c6..4be2653 100644
          return true;
      }
 -- 
-2.7.3
+2.7.4
 

Spigot-Server-Patches/0076-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From eb47524cfc19add78d89e412092c2adf158cb4fc Mon Sep 17 00:00:00 2001
+From e61675931315d61a0eaab3258128c674d59e3975 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event

Spigot-Server-Patches/0077-Speedup-BlockPos-by-fixing-inlining.patch

@@ -1,4 +1,4 @@
-From 415f22549d10633d475506ae3a4d4e7ec6179f79 Mon Sep 17 00:00:00 2001
+From 88cefc5d4dc82eeb95719ceee5d40341d2434b69 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 7 Mar 2016 12:51:01 -0700
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -219,5 +219,5 @@ index e7a95f3..2d56f02 100644
  
          public BlockPosition h() {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0078-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch

@@ -1,4 +1,4 @@
-From c2c05904915d7f992a37630a29b4ec7531065334 Mon Sep 17 00:00:00 2001
+From 4c628dcc065ddd266dfcf18b7bcd3060420f761b Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -26,5 +26,5 @@ index c0e1199..bc6c054 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.7.3
+2.7.4
 

Spigot-Server-Patches/0079-Disable-Scoreboards-for-non-players-by-default.patch

@@ -1,4 +1,4 @@
-From 50052b1803ecfffb6f06b08868fb2346c0a760d4 Mon Sep 17 00:00:00 2001
+From 0ce9c27495ac928d3b803d40753da0284429a90d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -37,7 +37,7 @@ index 871535c..25950bd 100644
  
                          if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 730d864..b23c399 100644
+index cc345d9..4a09ec3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1859,6 +1859,7 @@ public abstract class Entity implements ICommandListener {
@@ -49,5 +49,5 @@ index 730d864..b23c399 100644
      }
  
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0080-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,4 +1,4 @@
-From 64a5ce6845ec10f63c342d57c304a2c498025462 Mon Sep 17 00:00:00 2001
+From 1503f029ded104f093527e73cf51d77d5ac009b7 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities

Spigot-Server-Patches/0081-Complete-resource-pack-API.patch

@@ -1,4 +1,4 @@
-From 6b2584f4899da3022070748e261dafb89401a19c Mon Sep 17 00:00:00 2001
+From 7139eede06aaa7b9627fa63b8f9a2616f0c39e50 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
@@ -18,7 +18,7 @@ index 30ca225..148141d 100644
  
      public PacketPlayInResourcePackStatus() {}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 27f78ab..1b16b54 100644
+index 50fcc7c..5e83e50 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1026,7 +1026,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -37,7 +37,7 @@ index 27f78ab..1b16b54 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8827119..da99440 100644
+index 2f86dd3..a168a77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0082-Re-add-Spigot-s-hopper-check-feature.patch

@@ -1,11 +1,11 @@
-From 50ce8bd11dd95b966cc1d566901c12c92f0c707c Mon Sep 17 00:00:00 2001
+From e1ea0950cef2aa1054a3db5cb5c750602739fb22 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 12 Mar 2016 13:37:50 -0600
 Subject: [PATCH] Re-add Spigot's hopper-check feature
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7cd36da..854607a 100644
+index f967ec0..4d6e5fc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -282,4 +282,9 @@ public class PaperWorldConfig {
@@ -36,5 +36,5 @@ index 4cd2caa..6406bed 100644
              return false;
          } else {
 -- 
-2.7.3
+2.7.4
 

Spigot-Server-Patches/0083-Chunk-save-queue-improvements.patch

@@ -1,4 +1,4 @@
-From 14049623e6f66a86995dc945509711473321c5ca Mon Sep 17 00:00:00 2001
+From 4cc6be534b490919b4e2bff32bf93121d92f6c6c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -170,5 +170,5 @@ index 4733f94..113aea2 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0084-Chunk-Save-Reattempt.patch

@@ -1,4 +1,4 @@
-From fa15f3b5ad7afc8dbcf837c8fb8e8f0bee4ba2e9 Mon Sep 17 00:00:00 2001
+From 92679822582a085d38fef8fa9221b3c99e2696ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt

Spigot-Server-Patches/0085-Default-loading-permissions.yml-before-plugins.patch

@@ -1,4 +1,4 @@
-From 3c4e51d4560057b99af2c388f27cfdac4c6637c2 Mon Sep 17 00:00:00 2001
+From 521c61138ada72d1984b456255efe1d24335a33d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -30,7 +30,7 @@ index 2a391d5..2db9fc0 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cb9906a..2493a23 100644
+index 53bfbc4..8ffc06b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -306,6 +306,7 @@ public final class CraftServer implements Server {
@@ -51,5 +51,5 @@ index cb9906a..2493a23 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0086-Allow-Reloading-of-Custom-Permissions.patch

@@ -1,4 +1,4 @@
-From ab5c2b319d6632eeb2e56ff9300380eca3fa469e Mon Sep 17 00:00:00 2001
+From 4c91ca2b1fe10d6f28f9cf9f3c31568297310361 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions

Spigot-Server-Patches/0087-Invalidate-Metadata-on-reload.patch

@@ -1,4 +1,4 @@
-From adc937ad9523688f22f32b2ae51a5f376740e9fa Mon Sep 17 00:00:00 2001
+From 2b167a6a8c348387adc09456977514456dbb657d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Invalidate Metadata on reload
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will invalidate metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0aea5df..21fb010 100644
+index 29244e1..01a5ebe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1,31 +1,24 @@

Spigot-Server-Patches/0088-Undead-horse-leashing.patch

@@ -1,4 +1,4 @@
-From 402c065f538cc171d8aa3dc58c92194b4c8ded70 Mon Sep 17 00:00:00 2001
+From dc43a9c78695bcc273f89f2e343e7d686186fcd0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -6,7 +6,7 @@ Subject: [PATCH] Undead horse leashing
 default false to match vanilla, but option to allow undead horse types to be leashed.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 854607a..b5ed53f 100644
+index 4d6e5fc..38f94ce 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -287,4 +287,9 @@ public class PaperWorldConfig {

Spigot-Server-Patches/0089-Fix-Furnace-cook-time-bug.patch

@@ -1,4 +1,4 @@
-From a23d5f6af834a0d5c3d37defbe33161713419c12 Mon Sep 17 00:00:00 2001
+From 63cb0a322261ca30465a9ff95036501d02ee012a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:24:53 -0400
 Subject: [PATCH] Fix Furnace cook time bug

Spigot-Server-Patches/0090-Handle-Item-Meta-Inconsistencies.patch

@@ -1,4 +1,4 @@
-From f6b2eeddbd26f39eb3a0ab87f484247ecf801bd9 Mon Sep 17 00:00:00 2001
+From 8087698a536aa02f6c2fd3590e4eb9bd41c2a508 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies

Spigot-Server-Patches/0091-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From a09015c323fe1814a49cda6a08a69575fa75abde Mon Sep 17 00:00:00 2001
+From 0eb70e15ed6050e0d6bcf3b2c10cb3ff6ea05e03 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b5ed53f..38272c4 100644
+index 38f94ce..7d8a541 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -292,4 +292,13 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index b5ed53f..38272c4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 5ccdb88..e5f1b71 100644
+index df19327..8c261d0 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -144,7 +144,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {

Spigot-Server-Patches/0092-Optimize-BlockStateList-BlockData.patch

@@ -1,4 +1,4 @@
-From a408eea0372908e8cb7f4795b11de5e64e571564 Mon Sep 17 00:00:00 2001
+From 4ddf8ca6b66ac815c05020403f61108ce1b938b3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 19:15:44 -0400
 Subject: [PATCH] Optimize BlockStateList/BlockData

Spigot-Server-Patches/0093-Add-World-Util-Methods.patch

@@ -1,4 +1,4 @@
-From 5eafc0a2293770a3558d1e30c46f72f8a20d4e78 Mon Sep 17 00:00:00 2001
+From 44c89e9b0fc391d369d1213dbdbc0a925ab7b884 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 614cabe..2283536 100644
+index ad7a81c..d658fa2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess {
@@ -93,5 +93,5 @@ index 614cabe..2283536 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0094-Optimized-Light-Level-Comparisons.patch

@@ -1,4 +1,4 @@
-From 823b6ce3c72305580163aadb8d1222492ae95064 Mon Sep 17 00:00:00 2001
+From 6c92c7164a6032a1db7d37f07a46c9f303937352 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons

Spigot-Server-Patches/0095-Pass-world-to-Village-creation.patch

@@ -1,4 +1,4 @@
-From c53302d6e6686fb9d6360777aa9c350dd0997eaa Mon Sep 17 00:00:00 2001
+From bedf1c64bec230afeb374d62bb43eb9e9490746c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation

Spigot-Server-Patches/0096-Custom-replacement-for-eaten-items.patch

@@ -1,4 +1,4 @@
-From 6997b32417354b476329fec2cef26611865260aa Mon Sep 17 00:00:00 2001
+From 76d2d29b4343817fa91cbce9f4a635318cbd6246 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items

Spigot-Server-Patches/0097-Set-health-before-death-event.patch

@@ -1,4 +1,4 @@
-From 4f72aa405c25932dca93d306af28c96a343bfd0a Mon Sep 17 00:00:00 2001
+From 12e201bfb0a6bbbd6062ddff4209e23f89dea8e5 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
@@ -19,7 +19,7 @@ index 2db9fc0..5a9e032 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 693d5cb..ef522e7 100644
+index 0502593..3a0d338 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -98,11 +98,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -46,5 +46,5 @@ index 693d5cb..ef522e7 100644
  
      public double getMaxHealth() {
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0098-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,4 +1,4 @@
-From 2f5d4809b3c6bae28732715efc769cfcb6896155 Mon Sep 17 00:00:00 2001
+From 86e85867373de0f4473d131236191f6a43d36387 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data

Spigot-Server-Patches/0099-Catch-Async-PlayerChunkMap-operations.patch

@@ -1,4 +1,4 @@
-From 5bf55126d139a48620722be6c74abd0d07d04b6b Mon Sep 17 00:00:00 2001
+From 31512ee99a551bd2cfb70cc1dc3351a513309310 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations

Spigot-Server-Patches/0100-Support-offline-mode-in-whitelist-command-as-well.patch

@@ -1,4 +1,4 @@
-From 9f5c81eeb1c9cef943c5e1a32e5661d7bdef40bd Mon Sep 17 00:00:00 2001
+From b24a42a51ce2b505c2e5c4d6db906c86fde03305 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
@@ -87,5 +87,5 @@ index fdc9210..49e9ce1 100644
 +    }
  }
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0101-Optimize-Chunk-Unload-Queue.patch

@@ -1,4 +1,4 @@
-From 31bd0087461e17206c64771c0ec8fdf787955a5f Mon Sep 17 00:00:00 2001
+From e26a0dcdf9c130cac19a89266af08f9ec5adaf8a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 17:57:25 -0400
 Subject: [PATCH] Optimize Chunk Unload Queue
@@ -23,7 +23,7 @@ it will skip it and move to next.
 Also optimize EAR to use these methods.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f4ec2e4..ad69025 100644
+index 8b11266..ac35cf4 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -53,6 +53,8 @@ public class Chunk {
@@ -240,7 +240,7 @@ index 63e118d..721bcae 100644
                  i += server.getChunkAt( x, z ).entityCount.get( oClass );
              }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1e14a62..4cc729e 100644
+index d658fa2..0a3cfbc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -159,9 +159,15 @@ public abstract class World implements IBlockAccess {
@@ -348,5 +348,5 @@ index a1bd1a6..7fcd437 100644
          {
              isActive = false;
 -- 
-2.7.1.windows.2
+2.7.4
 

Spigot-Server-Patches/0102-Fix-SkullCache-case-bug.patch

@@ -1,4 +1,4 @@
-From 0c3a223e87348233b7c64ae18fddc88e169a95cd Mon Sep 17 00:00:00 2001
+From 25f458b42dc059d51743f85b6340048c777b7552 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
@@ -18,5 +18,5 @@ index 7eecc6c..3c20ef3 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.7.4.windows.1
+2.7.4
 

Spigot-Server-Patches/0103-Waving-banner-workaround.patch

@@ -1,4 +1,4 @@
-From abf35a0090814b09cebed274fc5b6ac6f964847c Mon Sep 17 00:00:00 2001
+From 2d41484aecd2aa30d934c36ce9b78f085bf5dfd2 Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -33,5 +33,5 @@ index c5c3f40..3ed2356 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.7.4.windows.1
+2.7.4