Remove several broken or unnecessary patches.

Removes PlayerMicroMoveEvent API, the ability to disable the AsyncCatcher, and the TeleportPassengerVehicleWithPlayer patch
2024-12-23 06:50:25 +01:00 · 2015-09-12 19:57:39 -05:00 · 2015-09-12 19:57:39 -05:00 · f243a4024d
commit f243a4024d
parent 88826e053a
66 changed files with 187 additions and 376 deletions
--- a/Spigot-API-Patches/0012-Add-BeaconEffectEvent.patch
+++ b/Spigot-API-Patches/0012-Add-BeaconEffectEvent.patch
@ -1,4 +1,4 @@
-From 0a8f1851697e1c3c179be7bce30a9ca5977e3a82 Mon Sep 17 00:00:00 2001
+From f126884b3b8347bc53ee7223e58f653028facacb Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Thu, 23 Jul 2015 11:45:20 -0700
 Subject: [PATCH] Add BeaconEffectEvent
@ -92,5 +92,5 @@ index 0000000..d9f9b95
 +    }
 +}
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-API-Patches/0012-Add-PlayerMicroMoveEvent.patch
+++ b/Spigot-API-Patches/0012-Add-PlayerMicroMoveEvent.patch
@ -1,47 +0,0 @@
-From cf879d7842c571b6c0ce3918a4619aa4f7247650 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@outlook.com>
-Date: Thu, 23 Jul 2015 03:19:57 -0700
-Subject: [PATCH] Add PlayerMicroMoveEvent
-
-
-diff --git a/src/main/java/org/github/paperspigot/event/player/PlayerMicroMoveEvent.java b/src/main/java/org/github/paperspigot/event/player/PlayerMicroMoveEvent.java
-new file mode 100644
-index 0000000..65b56d8
--- /dev/null
-+++ b/src/main/java/org/github/paperspigot/event/player/PlayerMicroMoveEvent.java
-@@ -0,0 +1,32 @@
-+package org.github.paperspigot.event.player;
-+
-+import org.bukkit.Location;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerMoveEvent;
-+
-+/**
-+ * This event is fired for player movements that are too small to track with PlayerMoveEvent.
-+ *
-+ * When used in combination with PlayerMoveEvent, it is possible to keep track of all
-+ * PacketPlayInFlying movements. This can be particularly useful for anti-cheat plugins.
-+ *
-+ * Please note this event is not intended for casual use. Plugins that casually use this event
-+ * may cause significant overhead depending on handler logic.
-+ */
-+public class PlayerMicroMoveEvent extends PlayerMoveEvent {
-+    private static final HandlerList handlerList = new HandlerList();
-+
-+    public PlayerMicroMoveEvent(Player player, Location from, Location to) {
-+        super(player, from, to);
-+    }
-+
-+    @Override
-+    public HandlerList getHandlers() {
-+        return getHandlerList();
-+    }
-+
-+    public static HandlerList getHandlerList() {
-+        return handlerList;
-+    }
-+}
-- 
-1.9.5.msysgit.1
-
--- a/Spigot-Server-Patches/0010-Ability-to-disable-asynccatcher.patch
+++ b/Spigot-Server-Patches/0010-Ability-to-disable-asynccatcher.patch
@ -1,41 +0,0 @@
-From b70a51538266e463d2f61265e8f241723a60e2aa Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sat, 7 Mar 2015 20:46:54 -0600
-Subject: [PATCH] Ability to disable asynccatcher
-
-
-diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-index 0e9d57f..c583a80 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-+++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-@@ -144,4 +144,14 @@ public class PaperSpigotConfig
-     {
-         babyZombieMovementSpeed = getDouble( "settings.baby-zombie-movement-speed", 0.5D ); // Player moves at 0.1F, for reference
-     }
-+
-+    public static boolean asyncCatcherFeature;
-+    private static void asyncCatcherFeature()
-+    {
-+        asyncCatcherFeature = getBoolean( "settings.async-plugin-bad-magic-catcher", true );
-+        if ( !asyncCatcherFeature )
-+        {
-+            Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this is not recommended and may cause issues" );
-+        }
-+    }
- }
-diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index 4b3aa85..f7e8d16 100644
--- a/src/main/java/org/spigotmc/AsyncCatcher.java
-+++ b/src/main/java/org/spigotmc/AsyncCatcher.java
-@@ -5,7 +5,7 @@ import net.minecraft.server.MinecraftServer;
- public class AsyncCatcher
- {
- 
-    public static boolean enabled = true;
-+    public static boolean enabled = org.github.paperspigot.PaperSpigotConfig.asyncCatcherFeature; // PaperSpigot - Allow disabling of AsyncCatcher from PaperSpigotConfig
- 
-     public static void catchOp(String reason)
-     {
-- 
-2.4.1.windows.1
-
--- a/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch
+++ b/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch
@ -1,11 +1,11 @@
-From 75e357a8a366b9f89e20cf0a799aef4f1f238915 Mon Sep 17 00:00:00 2001
+From 1140e6e20ae136b79caad18e198f7d552c0ba542 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 7 Mar 2015 21:00:13 -0600
 Subject: [PATCH] Configurable fishing time ranges


 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index c2bfb1f..28d698d 100644
+index 503e78a..f7d1539 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -331,7 +331,7 @@ public class EntityFishingHook extends Entity {
@ -18,7 +18,7 @@ index c2bfb1f..28d698d 100644
                         }
                     }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 014b8d9..b7afd3e 100644
+index db40fb8..5ae9afb 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -106,4 +106,12 @@ public class PaperSpigotWorldConfig
@ -35,5 +35,5 @@ index 014b8d9..b7afd3e 100644
 +    }
 }
 -- 
-1.9.1
+2.5.1

--- a/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
+++ b/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
@ -1,11 +1,11 @@
-From 16d6d0c97aa09ddcdf5f1073b347306496d94437 Mon Sep 17 00:00:00 2001
+From 3a9f1ad42ef76caca5fcfc663e91f27d9c963833 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 7 Mar 2015 21:03:06 -0600
 Subject: [PATCH] Allow nerfed mobs to jump


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index f8aec29..e83d94f 100644
+index a8a327d..aa38fe6 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -33,6 +33,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -42,5 +42,5 @@ index 6014b09..da019c1 100644
         ((Navigation) entityinsentient.getNavigation()).d(true);
     }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch
+++ b/Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch
@ -1,4 +1,4 @@
-From de755644734c4d38a0f6994b0c14bff2983216b6 Mon Sep 17 00:00:00 2001
+From 0c1371c36a93de12180683ee8c33bb9fb8d61cec Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 7 Mar 2015 21:07:10 -0600
 Subject: [PATCH] Toggle for player interact limiter
@ -19,12 +19,12 @@ index 68358e9..7ea74c0 100644
         } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 )
         {
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-index ae3d107..ae410b6 100644
+index 85ee51b..b0dd5b0 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-@@ -154,4 +154,14 @@ public class PaperSpigotConfig
-             Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this is not recommended and may cause issues" );
-         }
+@@ -144,4 +144,14 @@ public class PaperSpigotConfig
+     {
+         babyZombieMovementSpeed = getDouble( "settings.baby-zombie-movement-speed", 0.5D ); // Player moves at 0.1F, for reference
     }
 +
 +    public static boolean interactLimitEnabled;
@ -38,5 +38,5 @@ index ae3d107..ae410b6 100644
 +    }
 }
 -- 
-2.4.5.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
+++ b/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
@ -1,11 +1,11 @@
-From 780b846b8b4db8c88ea2a69dda56eea16ff9fe03 Mon Sep 17 00:00:00 2001
+From fbdc8216d9f45a2c13cdf26343f5306ccc73664b Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Sat, 7 Mar 2015 21:35:14 -0600
 Subject: [PATCH] Player Exhaustion Multipliers


 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 66e099f..df7e8e8 100644
+index 5e91e82..c26975a 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -566,7 +566,7 @@ public class Block {
@ -18,7 +18,7 @@ index 66e099f..df7e8e8 100644
             ItemStack itemstack = this.i(iblockdata);
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 9dce3ac..e7fd331 100644
+index e705b86..ae2c44e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1370,13 +1370,13 @@ public abstract class EntityHuman extends EntityLiving {
@ -38,7 +38,7 @@ index 9dce3ac..e7fd331 100644
             } else if (this.k_()) {
                 if (d1 > 0.0D) {
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index b7afd3e..ac2f470 100644
+index 5ae9afb..23a2a96 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -114,4 +114,12 @@ public class PaperSpigotWorldConfig
@ -55,5 +55,5 @@ index b7afd3e..ac2f470 100644
 +    }
 }
 -- 
-1.9.1
+2.5.1

--- a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
@ -1,11 +1,11 @@
-From f2df5ed23fb9826e49d5e97060ca5c34bdb0a325 Mon Sep 17 00:00:00 2001
+From 38ac29dbbda20d4ba78b51249c311026d597a50d Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Sat, 7 Mar 2015 21:40:48 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index e83d94f..783e43e 100644
+index aa38fe6..2d4d34c 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -439,13 +439,13 @@ public abstract class EntityInsentient extends EntityLiving {
@ -26,7 +26,7 @@ index e83d94f..783e43e 100644
                 }
             }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index ac2f470..7ad9bb3 100644
+index 23a2a96..1164186 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -122,4 +122,21 @@ public class PaperSpigotWorldConfig
@ -52,5 +52,5 @@ index ac2f470..7ad9bb3 100644
 +    }
 }
 -- 
-2.4.1.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
@ -1,11 +1,11 @@
-From bc01a5ab191290ee198332dab953d8d9d76691f4 Mon Sep 17 00:00:00 2001
+From 3688509ebd26b57e70a5d28caa24be2d44e3f387 Mon Sep 17 00:00:00 2001
 From: Dmck2b <itallhappenedverysuddenly@gmail.com>
 Date: Sat, 7 Mar 2015 21:50:40 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 13e1a90..32c882e 100644
+index af60059..03eb5f2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -230,6 +230,7 @@ public abstract class World implements IBlockAccess {
@ -17,7 +17,7 @@ index 13e1a90..32c882e 100644
         this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
         this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 7ad9bb3..8d707f7 100644
+index 1164186..b7703a0 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -139,4 +139,11 @@ public class PaperSpigotWorldConfig
@ -33,5 +33,5 @@ index 7ad9bb3..8d707f7 100644
 +    }
 }
 -- 
-1.9.1
+2.5.1

--- a/Spigot-Server-Patches/0016-Drop-falling-block-entities-that-are-above-the-speci.patch
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-entities-that-are-above-the-speci.patch
@ -1,4 +1,4 @@
-From 996541c984eb8ce498be51cbc5fec44fe62c897d Mon Sep 17 00:00:00 2001
+From ba42a80cc0bcbcbf2a8d3ecf0782b9acdc8c499e Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 7 Mar 2015 22:03:47 -0600
 Subject: [PATCH] Drop falling block entities that are above the specified
@ -28,7 +28,7 @@ index ce91553..ef93776 100644
             this.motY *= 0.9800000190734863D;
             this.motZ *= 0.9800000190734863D;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 8d707f7..8cdd858 100644
+index b7703a0..dcc02b7 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -146,4 +146,56 @@ public class PaperSpigotWorldConfig
@ -89,5 +89,5 @@ index 8d707f7..8cdd858 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch
@ -1,4 +1,4 @@
-From c1be9631772d9b5561405e8453be6183d60ad231 Mon Sep 17 00:00:00 2001
+From db282abf06283e8f054810398f6f9a96450b9ed9 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 7 Mar 2015 22:17:03 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
@ -42,7 +42,7 @@ index 5d36af3..de1dddb 100644
 +    }
 }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 8cdd858..9c961d7 100644
+index dcc02b7..d0a97b6 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -198,4 +198,11 @@ public class PaperSpigotWorldConfig
@ -58,5 +58,5 @@ index 8cdd858..9c961d7 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch
@ -1,11 +1,11 @@
-From aa29950c7eec042e9b0f3c063129a9a5cee85037 Mon Sep 17 00:00:00 2001
+From afaf20bf4d69579819800ee7daa8c9a677ebe318 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 18 May 2015 17:52:45 -0500
 Subject: [PATCH] Player affects spawning API


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 88e63f7..2a08976 100644
+index ae2c44e..b901c69 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -60,6 +60,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -17,7 +17,7 @@ index 88e63f7..2a08976 100644
     // CraftBukkit start
     public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 783e43e..c684bcd 100644
+index 2d4d34c..b82b984 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -431,7 +431,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -198,5 +198,5 @@ index 35608b7..a9b4160 100644
 
     public Player.Spigot spigot()
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0019-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch
+++ b/Spigot-Server-Patches/0019-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch
@ -1,4 +1,4 @@
-From 83c0be0ad5802b5f28be0bbe0e01796a45948e1a Mon Sep 17 00:00:00 2001
+From a68c4df208780c136387eb71047b13171c4bc077 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 7 Mar 2015 22:55:25 -0600
 Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and
@ -6,7 +6,7 @@ Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bc98e1f..1061088 100644
+index 2079772..f42b95c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1022,7 +1022,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -19,5 +19,5 @@ index bc98e1f..1061088 100644
 
     public CrashReport b(CrashReport crashreport) {
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0020-Metrics.patch
+++ b/Spigot-Server-Patches/0020-Metrics.patch
@ -1,4 +1,4 @@
-From ab136ccdac0f5ffe17a29588e19b386f2807e444 Mon Sep 17 00:00:00 2001
+From 23dd01f0baff0c2b06f42048d6d77c31a49e029d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 18 May 2015 18:58:44 -0500
 Subject: [PATCH] Metrics
@ -18,5 +18,5 @@ index a5fd59d..558989c 100644
         String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
         String serverVersion = Bukkit.getVersion();
 -- 
-2.4.1.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
@ -1,11 +1,11 @@
-From f4da307613f8297e8ed8560fe5cbfe65ee4ae0e5 Mon Sep 17 00:00:00 2001
+From e53f4135434c8a9b344c5bb03e9f7c963bbb7833 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sun, 8 Mar 2015 01:06:14 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities


 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index d5922fe..ea61f59 100644
+index 022ba31..7242d45 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -784,6 +784,11 @@ public class Chunk {
@ -21,7 +21,7 @@ index d5922fe..ea61f59 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(getType(blockposition)) + ") where there was no entity tile!");
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 9c961d7..e1b9a6c 100644
+index d0a97b6..5aa368f 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -205,4 +205,11 @@ public class PaperSpigotWorldConfig
@ -37,5 +37,5 @@ index 9c961d7..e1b9a6c 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0022-Remove-Spigot-TileEntity-Enity-Tick-Time-Capping.patch
+++ b/Spigot-Server-Patches/0022-Remove-Spigot-TileEntity-Enity-Tick-Time-Capping.patch
@ -1,4 +1,4 @@
-From 69ff788454fe936a8a6b851c88a7e316eae1bb69 Mon Sep 17 00:00:00 2001
+From bbb9617726f41937c438d39ba8b36f525724e2eb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 30 May 2015 01:21:00 -0500
 Subject: [PATCH] Remove Spigot TileEntity/Enity Tick Time Capping
@ -7,7 +7,7 @@ Appears to cause visual glitches with TNT Entities and certain types of cannons
 TileEntity cap removed as we implement our own solution in a later (next) patch.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d30b406..bdf4896 100644
+index 641db2a..40b9a13 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -125,8 +125,6 @@ public abstract class World implements IBlockAccess {
@ -123,5 +123,5 @@ index 23a3938..0000000
 -    }
 -}
 -- 
-2.4.1.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0023-Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/0023-Optimize-TileEntity-Ticking.patch
@ -1,4 +1,4 @@
-From 8e823d14fadf4eb9eab85ff1da2da88811fa255c Mon Sep 17 00:00:00 2001
+From 57871914afc8b81ed1a5383a76d50d62ca63ff93 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 8 Mar 2015 01:56:22 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
@ -35,7 +35,7 @@ index 4f280dd..3ea1b62 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 189fa93..07891ec 100644
+index 5eb55e5..b31973a 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
@@ -246,7 +246,7 @@ public class TileEntityChest extends TileEntityContainer implements IUpdatePlaye
@ -74,7 +74,7 @@ index f75e2de..7119612 100644
             if (this.e instanceof BlockDaylightDetector) {
                 ((BlockDaylightDetector) this.e).f(this.world, this.position);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c93f575..e04603f 100644
+index 40b9a13..ba40490 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -53,7 +53,7 @@ public abstract class World implements IBlockAccess {
@ -262,5 +262,5 @@ index 0000000..5af5dcc
 +}
 \ No newline at end of file
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0024-Move-sound-handling-out-of-the-chest-tick-loop.patch
+++ b/Spigot-Server-Patches/0024-Move-sound-handling-out-of-the-chest-tick-loop.patch
@ -1,11 +1,11 @@
-From 3cb95d0d115022e965df1b2f3c38fa772cea4cca Mon Sep 17 00:00:00 2001
+From a84455bbed79cd671e5bd181692d5775fdf33503 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Sun, 8 Mar 2015 03:16:39 -0500
 Subject: [PATCH] Move sound handling out of the chest tick loop


 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 07891ec..20f8d90 100644
+index b31973a..49726c6 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
@@ -12,13 +12,13 @@ public class TileEntityChest extends TileEntityContainer implements IUpdatePlaye
@ -194,5 +194,5 @@ index 5af5dcc..693f75c 100644
                     put(ignored, -1);
                 }
 -- 
-2.4.1.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0025-Remove-certain-entities-that-fly-through-unloaded-ch.patch
+++ b/Spigot-Server-Patches/0025-Remove-certain-entities-that-fly-through-unloaded-ch.patch
@ -1,4 +1,4 @@
-From 8892ee45c27775cac74e3e9d8a51aac4123d8337 Mon Sep 17 00:00:00 2001
+From 8acc5bbbd936c86b177adad2e2c050dd160b057f Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Sun, 8 Mar 2015 03:34:15 -0500
 Subject: [PATCH] Remove certain entities that fly through unloaded chunks
--- a/Spigot-Server-Patches/0026-Configurable-strength-and-weakness-effect-modifiers.patch
+++ b/Spigot-Server-Patches/0026-Configurable-strength-and-weakness-effect-modifiers.patch
@ -1,4 +1,4 @@
-From 2e59ad6e50a369c6e6f6cf1e8282ceaba1cad314 Mon Sep 17 00:00:00 2001
+From 6a6fa20de00252fd6554c21ef476b3b0ce4910f5 Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Sun, 8 Mar 2015 03:41:33 -0500
 Subject: [PATCH] Configurable strength and weakness effect modifiers
@ -18,10 +18,10 @@ index 620685a..175503b 100644
     }
 }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-index dd34ced..d982f07 100644
+index b0dd5b0..5df90f9 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-@@ -164,4 +164,12 @@ public class PaperSpigotConfig
+@@ -154,4 +154,12 @@ public class PaperSpigotConfig
             Bukkit.getLogger().log( Level.INFO, "Disabling player interaction limiter, your server may be more vulnerable to malicious users" );
         }
     }
@ -35,5 +35,5 @@ index dd34ced..d982f07 100644
 +    }
 }
 -- 
-2.5.0
+2.5.1

--- a/Spigot-Server-Patches/0027-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0027-Further-improve-server-tick-loop.patch
@ -1,4 +1,4 @@
-From a745f29f464ae96eaee025dbb9de05d3b3f936bb Mon Sep 17 00:00:00 2001
+From 65afaa861ad3628efbc2508ea816ee8992cdf573 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 8 Mar 2015 03:47:32 -0500
 Subject: [PATCH] Further improve server tick loop
@ -216,5 +216,5 @@ index be2e31d..21fd7ef 100644
         return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                 + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
 -- 
-2.5.0
+2.5.1

--- a/Spigot-Server-Patches/0028-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0028-Only-refresh-abilities-if-needed.patch
@ -1,4 +1,4 @@
-From d9dab96eab52fcfed9c788818d0298a743da2932 Mon Sep 17 00:00:00 2001
+From 5fd334ff63caf9bea97f9574120699f24537f032 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Nov 2014 13:20:22 -0600
 Subject: [PATCH] Only refresh abilities if needed
@ -24,5 +24,5 @@ index a9b4160..506a03c 100644
 
     @Override
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0029-Configurable-game-mechanics-changes.patch
+++ b/Spigot-Server-Patches/0029-Configurable-game-mechanics-changes.patch
@ -1,4 +1,4 @@
-From e07e85b7558bde9b523c28990d157aab02baa589 Mon Sep 17 00:00:00 2001
+From eeaf61196f789fb6b4efb4b78ca6912ef28426ab Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Sun, 8 Mar 2015 04:10:02 -0500
 Subject: [PATCH] Configurable game mechanics changes
@ -63,7 +63,7 @@ index f6a43c0..0e6f8c0 100644
 +    }
 }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 7804086..9e2f4d1 100644
+index 729cbf1..88ee38a 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -222,4 +222,10 @@ public class PaperSpigotWorldConfig
@ -78,5 +78,5 @@ index 7804086..9e2f4d1 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0030-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0030-Add-async-chunk-load-API.patch
@ -1,11 +1,11 @@
-From 4c36ad5483d3c75a3e9588e208e3012f472eb726 Mon Sep 17 00:00:00 2001
+From e4b4e41622bb6125ddbfabe33403e5da9352793e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 6 Nov 2014 18:29:20 -0600
 Subject: [PATCH] Add async chunk load API


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c1d552a..da84cd5 100644
+index 17f2c0a..552f5c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -122,6 +122,24 @@ public class CraftWorld implements World {
@ -34,5 +34,5 @@ index c1d552a..da84cd5 100644
         return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk;
     }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0031-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch
+++ b/Spigot-Server-Patches/0031-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch
@ -1,11 +1,11 @@
-From e1554354226977651da048151eaf50edbd8cb30a Mon Sep 17 00:00:00 2001
+From fcac891d73274bc95cbac4441c372560634b190f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sun, 30 Nov 2014 18:58:07 -0600
 Subject: [PATCH] Allow specified ItemStacks to retain their invalid data


 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index dbef942..2fc2698 100644
+index 5496805..015ce28 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -18,6 +18,8 @@ import org.bukkit.entity.Player;
@ -34,7 +34,7 @@ index dbef942..2fc2698 100644
             }
         }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-index 5ff1c26..ab21bbf 100644
+index 5df90f9..744773d 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
@@ -6,11 +6,10 @@ import java.io.IOException;
@ -51,7 +51,7 @@ index 5ff1c26..ab21bbf 100644
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.configuration.InvalidConfigurationException;
-@@ -172,4 +171,11 @@ public class PaperSpigotConfig
+@@ -162,4 +161,11 @@ public class PaperSpigotConfig
         strengthEffectModifier = getDouble( "effect-modifiers.strength", 1.3D );
         weaknessEffectModifier = getDouble( "effect-modifiers.weakness", -0.5D );
     }
@ -64,5 +64,5 @@ index 5ff1c26..ab21bbf 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0032-Add-TNT-source-location-API.patch
+++ b/Spigot-Server-Patches/0032-Add-TNT-source-location-API.patch
@ -1,4 +1,4 @@
-From d990bd4b2502bc262c2ccab5dd1d51e586a4169d Mon Sep 17 00:00:00 2001
+From 0c46756ed4495d127ded0a83745e8d5b003cc64b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 8 Mar 2015 04:23:41 -0500
 Subject: [PATCH] Add TNT source location API
@ -98,7 +98,7 @@ index 50423eb..1daba4e 100644
 
     public EntityLiving getSource() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index da84cd5..a5de9aa 100644
+index 552f5c3..05b88fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1110,7 +1110,8 @@ public class CraftWorld implements World {
@ -128,5 +128,5 @@ index e08ad47..b7e8b4d 100644
 +    // PaperSpigot end
 }
 -- 
-2.4.5.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0033-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0033-Prevent-tile-entity-and-entity-crashes.patch
@ -1,4 +1,4 @@
-From 3a5f22368dab9706d143d558df225a0be5da593e Mon Sep 17 00:00:00 2001
+From df2b16b33722bf1304a3d5e29443dd2e1317a12f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 8 Mar 2015 04:37:23 -0500
 Subject: [PATCH] Prevent tile entity and entity crashes
@ -64,5 +64,5 @@ index 624352c..915a02d 100644
                     // Spigot start
                     finally {
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0034-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0034-Configurable-top-of-nether-void-damage.patch
@ -1,4 +1,4 @@
-From 24980479558d3b0fb8eccbbf428518d78514c161 Mon Sep 17 00:00:00 2001
+From a1f9b6079003b39860e02302b66dee4ac3499c8b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 23 Feb 2015 14:57:28 -0600
 Subject: [PATCH] Configurable top of nether void damage
--- a/Spigot-Server-Patches/0035-Enderman-drop-the-block-they-re-holding-when-they-di.patch
+++ b/Spigot-Server-Patches/0035-Enderman-drop-the-block-they-re-holding-when-they-di.patch
@ -1,4 +1,4 @@
-From 18351b1718062abf74c518550b3a015e92b2147a Mon Sep 17 00:00:00 2001
+From 7e6a639b4eeeb3688319bfc3fd0ef1cce75af8b2 Mon Sep 17 00:00:00 2001
 From: Zach <zach.brown@destroystokyo.com>
 Date: Fri, 13 Feb 2015 14:49:30 -0600
 Subject: [PATCH] Enderman drop the block they're holding when they die
@ -23,5 +23,5 @@ index a250062..f3afbbd 100644
 
     public void setCarried(IBlockData iblockdata) {
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0036-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0036-Check-online-mode-before-converting-and-renaming-pla.patch
@ -1,4 +1,4 @@
-From 6375d90d6df3c87a9bfb783c07e2bf7333737390 Mon Sep 17 00:00:00 2001
+From cf35b82adfa15a02ee3df2704c41c691b53483ed Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 5 Mar 2015 15:30:06 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
@ -18,5 +18,5 @@ index 7c51750..e5124af 100644
                 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                 if ( file.exists() )
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0037-Fix-redstone-lag-issues.patch
+++ b/Spigot-Server-Patches/0037-Fix-redstone-lag-issues.patch
@ -1,11 +1,11 @@
-From cc1ca0b2afe1d8eb6dc140173f5eb2f1fe6c1a74 Mon Sep 17 00:00:00 2001
+From 293682fbe2ac59c0b9e4409994d61b8ce4389794 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 13 Apr 2015 15:47:15 -0500
 Subject: [PATCH] Fix redstone lag issues


 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6755143..59296d0 100644
+index effac28..a94c6dc 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -611,6 +611,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -54,7 +54,7 @@ index 6755143..59296d0 100644
                 this.methodProfiler.a("ticking");
                 Iterator iterator = this.V.iterator();
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index e0926a2..bcd8b65 100644
+index c1f21ae..8421e3b 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -234,4 +234,14 @@ public class PaperSpigotWorldConfig
@ -73,5 +73,5 @@ index e0926a2..bcd8b65 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0038-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0038-Always-tick-falling-blocks.patch
@ -1,4 +1,4 @@
-From 97c465a59fc4f6a14819ca31b670aedfbbd3709e Mon Sep 17 00:00:00 2001
+From e9c50edad5d027adaae0bf05ddf8a171c11f9fe5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 10 Apr 2015 18:07:36 -0500
 Subject: [PATCH] Always tick falling blocks
@ -25,5 +25,5 @@ index 621a717..7ca1b24 100644
                 || entity instanceof EntityFireworks )
         {
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0039-Add-FallingBlock-source-location-API.patch
+++ b/Spigot-Server-Patches/0039-Add-FallingBlock-source-location-API.patch
@ -1,4 +1,4 @@
-From 15c06856e7b75ae48b44b56200fa2e537dafd218 Mon Sep 17 00:00:00 2001
+From c087d87d113e3146aadf499a59b7fd25ae3e0836 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Fri, 17 Apr 2015 02:26:14 -0700
 Subject: [PATCH] Add FallingBlock source location API
@ -96,7 +96,7 @@ index 5931e1d..44219cd 100644
 
     public void a(boolean flag) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a5de9aa..ce10832 100644
+index 05b88fd..4402d57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -886,7 +886,10 @@ public class CraftWorld implements World {
@ -141,5 +141,5 @@ index 788f26b..f2dfedd 100644
 +    // PaperSpigot end
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0040-Configurable-async-light-updates.patch
+++ b/Spigot-Server-Patches/0040-Configurable-async-light-updates.patch
@ -1,4 +1,4 @@
-From 8c3d7a7362a12d51282681fb5db2e24c2faedce7 Mon Sep 17 00:00:00 2001
+From 52a08c186d6719c42f5f2a2867f6b2a8d67a54da Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 1 Jul 2015 00:18:10 -0700
 Subject: [PATCH] Configurable async light updates
@ -232,5 +232,5 @@ index 8421e3b..fa5066b 100644
 +    }
 }
 -- 
-2.4.6.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0041-Optimize-draining.patch
+++ b/Spigot-Server-Patches/0041-Optimize-draining.patch
@ -1,4 +1,4 @@
-From 1de69d5b502fa3bb7b18cb1ca7ec37689cde363a Mon Sep 17 00:00:00 2001
+From f397692854ffdf5028e8ed4f904228e13150da68 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Fri, 10 Apr 2015 02:24:20 -0700
 Subject: [PATCH] Optimize draining
@ -25,5 +25,5 @@ index de1dddb..ff18f63 100644
             }
         } else {
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0042-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0042-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@ -1,11 +1,11 @@
-From 3772a5be518e8930b47c68d85379780ada09a3c0 Mon Sep 17 00:00:00 2001
+From 2886b4137635246b7104e9b2e23508c9fc8085b5 Mon Sep 17 00:00:00 2001
 From: Roman Alexander <romanalexander@users.noreply.github.com>
 Date: Fri, 27 Mar 2015 00:52:24 -0400
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2a08976..18edb61 100644
+index b901c69..cc1e33c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -974,7 +974,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -18,7 +18,7 @@ index 2a08976..18edb61 100644
                     if (flag && f > 0.0F) {
                         f *= 1.5F;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index fa9ae6c..81438c3 100644
+index fa5066b..0b1a96e 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -224,9 +224,11 @@ public class PaperSpigotWorldConfig
@ -34,5 +34,5 @@ index fa9ae6c..81438c3 100644
 
     public boolean netherVoidTopDamage;
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0043-Add-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0043-Add-PlayerLocaleChangeEvent.patch
@ -1,11 +1,11 @@
-From 296b917ee20dde6f55318b38fe1910c911b06013 Mon Sep 17 00:00:00 2001
+From 42ec7f44c7264b24671c8903f2e95230911ff01d Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Mon, 27 Apr 2015 21:41:39 -0500
 Subject: [PATCH] Add PlayerLocaleChangeEvent


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3438d3a..c268145 100644
+index 3810f86..be50b55 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -995,7 +995,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -23,7 +23,7 @@ index 3438d3a..c268145 100644
         this.bS = packetplayinsettings.d();
         this.getDataWatcher().watch(10, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c1085a0..046b87a 100644
+index d1bd480..2dd8508 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -963,4 +963,13 @@ public class CraftEventFactory {
@ -41,5 +41,5 @@ index c1085a0..046b87a 100644
 +    // PaperSpigot end
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0044-Fix-jar-being-shaded-multiple-times.patch
+++ b/Spigot-Server-Patches/0044-Fix-jar-being-shaded-multiple-times.patch
@ -1,11 +1,11 @@
-From 6483c2495bccdc76b8a035aab0d340790e6d8c88 Mon Sep 17 00:00:00 2001
+From c683bad12f9fef3edc363aa63b6882bec702d7ce Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Thu, 30 Apr 2015 22:42:34 -0400
 Subject: [PATCH] Fix jar being shaded multiple times


 diff --git a/pom.xml b/pom.xml
-index bc0a4a6..1359743 100644
+index 9678b08..4ec5bf6 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -138,6 +138,7 @@
@ -17,5 +17,5 @@ index bc0a4a6..1359743 100644
                         <manifestEntries>
                             <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0045-Configurable-end-credits-when-leaving-the-end.patch
+++ b/Spigot-Server-Patches/0045-Configurable-end-credits-when-leaving-the-end.patch
@ -1,11 +1,11 @@
-From 33ed2e63b8039296ed56504e90b03313e3821c9b Mon Sep 17 00:00:00 2001
+From 67097b3f8de099ce7948d144b71ad259614dc86d Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Thu, 28 May 2015 20:12:38 -0500
 Subject: [PATCH] Configurable end credits when leaving the end


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c268145..592fb75 100644
+index be50b55..161b191 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -508,11 +508,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -51,7 +51,7 @@ index c268145..592fb75 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 461e3f9..1c549bb 100644
+index d3d19dd..deb0b82 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -666,6 +666,8 @@ public abstract class PlayerList {
@ -74,7 +74,7 @@ index 461e3f9..1c549bb 100644
             return;
         }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 81438c3..6de509c 100644
+index 0b1a96e..36e0948 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -253,4 +253,10 @@ public class PaperSpigotWorldConfig
@ -89,5 +89,5 @@ index 81438c3..6de509c 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0046-Force-load-chunks-for-specific-entities-that-fly-thr.patch
+++ b/Spigot-Server-Patches/0046-Force-load-chunks-for-specific-entities-that-fly-thr.patch
@ -1,4 +1,4 @@
-From 2f171ca378d3e21e98af7b0c15209d882a64af2d Mon Sep 17 00:00:00 2001
+From 5f8a27a95437af90359b01db1779bb7abe2575ab Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 30 Jun 2015 20:45:24 -0700
 Subject: [PATCH] Force load chunks for specific entities that fly through
--- a/Spigot-Server-Patches/0047-Stackable-Buckets.patch
+++ b/Spigot-Server-Patches/0047-Stackable-Buckets.patch
@ -1,4 +1,4 @@
-From 7f6d67f412bdc91a8f27531601123d4b9164fdfc Mon Sep 17 00:00:00 2001
+From 28fca00e699af7dbdbafe396966a04af327632c2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 1 Jun 2015 22:21:52 -0700
 Subject: [PATCH] Stackable Buckets
@ -98,7 +98,7 @@ index 7ea74c0..18d8d2d 100644
                         case DENY:
                             /* Needs enum constructor in InventoryAction
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-index ab21bbf..aba8f87 100644
+index 744773d..31c4cf8 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
@@ -3,14 +3,19 @@ package org.github.paperspigot;
@ -121,7 +121,7 @@ index ab21bbf..aba8f87 100644
 import org.bukkit.command.Command;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
-@@ -178,4 +183,47 @@ public class PaperSpigotConfig
+@@ -168,4 +173,47 @@ public class PaperSpigotConfig
         dataValueAllowedItems = new HashSet<Integer>( getList( "data-value-allowed-items", Collections.emptyList() ) );
         Bukkit.getLogger().info( "Data value allowed items: " + StringUtils.join(dataValueAllowedItems, ", ") );
     }
@ -170,5 +170,5 @@ index ab21bbf..aba8f87 100644
 +    }
 }
 -- 
-2.4.5.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0048-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0048-Fix-lag-from-explosions-processing-dead-entities.patch
@ -1,11 +1,11 @@
-From a5968599f8a76073b633fd2c6fa8b0ee1d5d2ce2 Mon Sep 17 00:00:00 2001
+From 961fbe71802e56572edebadff37812a7c99c9449 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Mon, 1 Jun 2015 22:54:18 -0700
 Subject: [PATCH] Fix lag from explosions processing dead entities


 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 85f2ab5..349854f 100644
+index c41b911..78e3a7d 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -103,7 +103,14 @@ public class Explosion {
@ -25,5 +25,5 @@ index 85f2ab5..349854f 100644
 
         for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0048-Teleport-passenger-vehicle-with-player.patch
+++ b/Spigot-Server-Patches/0048-Teleport-passenger-vehicle-with-player.patch
@ -1,101 +0,0 @@
-From cfda7e08ad109fcd5f7afaa1407d26993c6d3878 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 31 May 2015 01:44:02 -0500
-Subject: [PATCH] Teleport passenger/vehicle with player
-
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 68126c4..d7b0dc6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -41,6 +41,15 @@ public abstract class Entity implements ICommandListener {
-     }
-     // CraftBukikt end
- 
-+    // PaperSpigot start - Teleport passenger/vehicle with player
-+    public void retrack() {
-+        final EntityTracker entityTracker = ((WorldServer) world).getTracker();
-+        entityTracker.untrackEntity(this);
-+        entityTracker.track(this);
-+
-+    }
-+    // PaperSpigot end
-+
-     private static final AxisAlignedBB a = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
-     private static int entityCount;
-     private int id;
-@@ -1968,7 +1977,7 @@ public abstract class Entity implements ICommandListener {
-             // minecraftserver.getPlayerList().changeWorld(this, j, worldserver, worldserver1);
-             boolean before = worldserver1.chunkProviderServer.forceChunkLoad;
-             worldserver1.chunkProviderServer.forceChunkLoad = true;
-            worldserver1.getMinecraftServer().getPlayerList().repositionEntity(this, exit, portal);
-+            //worldserver1.getMinecraftServer().getPlayerList().repositionEntity(this, exit, portal); // PaperSpigot - Teleport passenger/vehicle with player, no... this entity is dead;
-             worldserver1.chunkProviderServer.forceChunkLoad = before;
-             // CraftBukkit end
-             this.world.methodProfiler.c("reloading");
-@@ -1976,6 +1985,12 @@ public abstract class Entity implements ICommandListener {
- 
-             if (entity != null) {
-                 entity.n(this);
-+
-+                // PaperSpigot start - Teleport passenger/vehicle with player, move entity to new location
-+                exit.getBlock(); // force load
-+                entity.setLocation(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch());
-+                // PaperSpigot end
-+
-                 /* CraftBukkit start - We need to do this...
-                 if (j == 1 && i == 1) {
-                     BlockPosition blockposition = this.world.r(worldserver1.getSpawn());
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 506a03c..9612c79 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -450,7 +450,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         }
- 
-         // If this player is riding another entity, we must dismount before teleporting.
-        entity.mount(null);
-+        // PaperSpigot start - Teleport passenger/vehicle with player
-+        //entity.mount(null);
-+
-+        Entity vehicle = entity.vehicle;
-+        Entity passenger = entity.passenger;
-+        if (vehicle != null) {
-+            vehicle.passenger = null;
-+            vehicle.teleportTo(location, false);
-+            vehicle = vehicle.getBukkitEntity().getHandle();
-+            entity.vehicle = vehicle;
-+            vehicle.passenger = entity;
-+        }
-+
-+        if (passenger != null) {
-+            passenger.vehicle = null;
-+            passenger.teleportTo(location, false);
-+            passenger = passenger.getBukkitEntity().getHandle();
-+            entity.passenger = passenger;
-+            passenger.vehicle = entity;
-+        }
-+        // PaperSpigot end
- 
-         // Update the From Location
-         from = event.getFrom();
-@@ -471,6 +491,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         } else {
-             server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
-         }
-+
-+        // PaperSpigot start - Teleport passenger/vehicle with player
-+        if (vehicle != null) {
-+            vehicle.retrack();
-+            //entity.retrack();
-+        }
-+        if (passenger != null) {
-+            passenger.retrack();
-+        }
-+        // PaperSpigot end
-         return true;
-     }
- 
-- 
-2.5.1
-
--- a/Spigot-Server-Patches/0049-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0049-Generator-Settings.patch
@ -1,4 +1,4 @@
-From 34c280302d637eac20ef44556f6b3a69097a8afb Mon Sep 17 00:00:00 2001
+From 491a1bf4ae6384acb335ebb242b5727db1e75c73 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 2 Jun 2015 00:41:23 -0700
 Subject: [PATCH] Generator Settings
@ -243,7 +243,7 @@ index 0f8211a..e76acfc 100644
         Iterator iterator = this.e.values().iterator();
 
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index e6ecaff..b9b76ce 100644
+index a78d748..d2fe995 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -269,4 +269,28 @@ public class PaperSpigotWorldConfig
@ -276,5 +276,5 @@ index e6ecaff..b9b76ce 100644
 +    }
 }
 -- 
-2.4.5.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0050-Configurable-TNT-cannon-fix.patch
+++ b/Spigot-Server-Patches/0050-Configurable-TNT-cannon-fix.patch
@ -1,4 +1,4 @@
-From c153230c831cd274fc10dd655874fae09034d247 Mon Sep 17 00:00:00 2001
+From 82c8f7165ca3c3e800a44ea4225fb1e7c43653f7 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Thu, 4 Jun 2015 13:55:02 -0700
 Subject: [PATCH] Configurable TNT cannon fix
--- a/Spigot-Server-Patches/0051-FallingBlock-and-TNT-entities-collide-with-specific-.patch
+++ b/Spigot-Server-Patches/0051-FallingBlock-and-TNT-entities-collide-with-specific-.patch
@ -1,11 +1,11 @@
-From 0e36863443cc986994e8c80ba7736b444f6fb5bf Mon Sep 17 00:00:00 2001
+From dbad7403c71170dedfd8ea73c9e5e1a4fe4c4b43 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Fri, 5 Jun 2015 00:43:17 -0700
 Subject: [PATCH] FallingBlock and TNT entities collide with specific blocks


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 26f54c8..029fc5a 100644
+index 27cb4ed..4bb6feb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1203,7 +1203,15 @@ public abstract class World implements IBlockAccess {
@ -26,7 +26,7 @@ index 26f54c8..029fc5a 100644
                         }
                     }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 37369e8..0b75e16 100644
+index beeaa0b..88e0644 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -332,4 +332,10 @@ public class PaperSpigotWorldConfig
@ -41,5 +41,5 @@ index 37369e8..0b75e16 100644
 +    }
 }
 -- 
-2.4.6.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0052-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0052-Optimize-explosions.patch
@ -1,4 +1,4 @@
-From 55a6cbf5107d0b99e62cbcf5a94707e692366871 Mon Sep 17 00:00:00 2001
+From 0c565e604fa92cddf6f902ed529bb5ba315e61e4 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 16 Jun 2015 05:52:58 -0700
 Subject: [PATCH] Optimize explosions
--- a/Spigot-Server-Patches/0053-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0053-Stop-updating-flowing-block-if-material-has-changed.patch
@ -1,4 +1,4 @@
-From a91dd11349c295d85d730ec226dbed76add3ca3d Mon Sep 17 00:00:00 2001
+From 7efa7a8be42cd0321c5ad50b34b6be6d3259adce Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Tue, 30 Jun 2015 19:31:02 -0700
 Subject: [PATCH] Stop updating flowing block if material has changed
@ -17,5 +17,5 @@ index ff18f63..ab2e43f 100644
 
         if (this.h(world, blockposition.down(), iblockdata2)) {
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0054-Fast-draining.patch
+++ b/Spigot-Server-Patches/0054-Fast-draining.patch
@ -1,4 +1,4 @@
-From 08a352192b00d7f4bc07986fb3aaf330d6d45d25 Mon Sep 17 00:00:00 2001
+From aa955c7dfb569fb3aebbe2e6f60da3752e8174cd Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 30 Jun 2015 19:53:03 -0700
 Subject: [PATCH] Fast draining
@ -80,7 +80,7 @@ index ab2e43f..fc3fc48 100644
 +    }
 }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 4596e9d..4c6bfb9 100644
+index f3228d9..2ecacd5 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -344,4 +344,12 @@ public class PaperSpigotWorldConfig
@ -97,5 +97,5 @@ index 4596e9d..4c6bfb9 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0055-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0055-Configurable-lava-flow-speed.patch
@ -1,4 +1,4 @@
-From 78684996aa3b507362093ba5bc99a61205825eb6 Mon Sep 17 00:00:00 2001
+From 2deee5c42a44793df5f89de7e5fb7df1d5627cad Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 1 Jul 2015 00:38:10 -0700
 Subject: [PATCH] Configurable lava flow speed
@ -19,7 +19,7 @@ index fc3fc48..23130ba 100644
                 world.getType(blockposition.north(1)).getBlock().getMaterial() == Material.LAVA ||
                         world.getType(blockposition.south(1)).getBlock().getMaterial() == Material.LAVA ||
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 4c6bfb9..20cf3ce 100644
+index 2ecacd5..9ae1b18 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -352,4 +352,12 @@ public class PaperSpigotWorldConfig
@ -36,5 +36,5 @@ index 4c6bfb9..20cf3ce 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0056-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0056-Add-player-view-distance-API.patch
@ -1,4 +1,4 @@
-From 29c575de4f07018891ef38d18e6c99fd23d0a9e7 Mon Sep 17 00:00:00 2001
+From 945a14ac82bd7aa1a153f06d2a76a7e3b8687b07 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 1 Jul 2015 00:59:06 -0700
 Subject: [PATCH] Add player view distance API
@ -112,10 +112,10 @@ index abb24c8..38586aa 100644
         return i * 16 - 16;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9612c79..8fdfdcf 100644
+index 506a03c..e318072 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1514,6 +1514,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1484,6 +1484,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             getHandle().affectsSpawning = affects;
         }
         // PaperSpigot end
@ -135,5 +135,5 @@ index 9612c79..8fdfdcf 100644
 
     public Player.Spigot spigot()
 -- 
-2.5.0.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0057-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0057-Disable-explosion-knockback.patch
@ -1,4 +1,4 @@
-From 50af34629e3423ad5e945f3206a9a65ff752d905 Mon Sep 17 00:00:00 2001
+From b6bcd4eeed774451bb1ba43c26c50c7fb1a59bc3 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Tue, 14 Jul 2015 09:20:44 -0700
 Subject: [PATCH] Disable explosion knockback
--- a/Spigot-Server-Patches/0058-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0058-Disable-thunder.patch
@ -1,11 +1,11 @@
-From 10aeb7030c8694ef21eeb286494dd8e2dcd274e1 Mon Sep 17 00:00:00 2001
+From a93433a91df12fa94a3ebbb3fc3c7ca4fa997a54 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Tue, 14 Jul 2015 09:26:41 -0700
 Subject: [PATCH] Disable thunder


 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 59296d0..235f1c8 100644
+index a94c6dc..2a3b944 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -422,7 +422,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -18,7 +18,7 @@ index 59296d0..235f1c8 100644
                     i1 = this.m >> 2;
                     blockposition = this.a(new BlockPosition(k + (i1 & 15), 0, l + (i1 >> 8 & 15)));
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 178f251..4ebd9dd 100644
+index b5bc358..c5425ab 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -366,4 +366,10 @@ public class PaperSpigotWorldConfig
@ -33,5 +33,5 @@ index 178f251..4ebd9dd 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0059-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0059-Disable-ice-and-snow.patch
@ -1,11 +1,11 @@
-From 4fbb05cc2918c6ffe6476a7cea7320107bb24bc7 Mon Sep 17 00:00:00 2001
+From 4312c8aaf1c6b4bbe930656eabb2b653c2aa385c Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Tue, 14 Jul 2015 09:28:31 -0700
 Subject: [PATCH] Disable ice and snow


 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 235f1c8..a6452bb 100644
+index 2a3b944..06c7057 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -432,7 +432,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -18,7 +18,7 @@ index 235f1c8..a6452bb 100644
                     i1 = this.m >> 2;
                     blockposition = this.q(new BlockPosition(k + (i1 & 15), 0, l + (i1 >> 8 & 15)));
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 4ebd9dd..03d3705 100644
+index c5425ab..25e92f8 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -372,4 +372,10 @@ public class PaperSpigotWorldConfig
@ -33,5 +33,5 @@ index 4ebd9dd..03d3705 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0060-Disable-mood-sounds.patch
+++ b/Spigot-Server-Patches/0060-Disable-mood-sounds.patch
@ -1,11 +1,11 @@
-From 6c20111c656352bb5d39c290223c637b1c197470 Mon Sep 17 00:00:00 2001
+From 21b00da362626c728267c4d2de150aa55f4bc798 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Tue, 14 Jul 2015 09:30:28 -0700
 Subject: [PATCH] Disable mood sounds


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8ec26ea..65fc9c1 100644
+index 30d94f5..9bf13b5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2231,7 +2231,7 @@ public abstract class World implements IBlockAccess {
@ -18,7 +18,7 @@ index 8ec26ea..65fc9c1 100644
             int k = this.m >> 2;
             int l = k & 15;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 03d3705..2371123 100644
+index 25e92f8..8e5de323 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -378,4 +378,10 @@ public class PaperSpigotWorldConfig
@ -33,5 +33,5 @@ index 03d3705..2371123 100644
 +    }
 }
 -- 
-2.4.6.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0061-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0061-Configurable-mob-spawner-tick-rate.patch
@ -1,4 +1,4 @@
-From 7d96e720cf8437a329fb14e8eb3a6bacb5dfef1d Mon Sep 17 00:00:00 2001
+From b0d7d51634a84f052108fa288f897577d7b0c569 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Tue, 14 Jul 2015 09:58:15 -0700
 Subject: [PATCH] Configurable mob spawner tick rate
@ -50,7 +50,7 @@ index ebd1e36..d4674dc 100644
                 }
 
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 2371123..9c8a01b 100644
+index 8e5de323..12697ff 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -384,4 +384,10 @@ public class PaperSpigotWorldConfig
@ -65,5 +65,5 @@ index 2371123..9c8a01b 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0062-Optimize-getCubes.patch
+++ b/Spigot-Server-Patches/0062-Optimize-getCubes.patch
@ -1,11 +1,11 @@
-From e20f84e870b9f6665f2b4b220e8f425c9c72200f Mon Sep 17 00:00:00 2001
+From 03afa71b61d4b3348b036cec44f4b30e0331cf7a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 14 Jul 2015 10:03:45 -0700
 Subject: [PATCH] Optimize getCubes()


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 65fc9c1..d890a00 100644
+index 9bf13b5..dff3424 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1162,11 +1162,12 @@ public abstract class World implements IBlockAccess {
@ -41,5 +41,5 @@ index 65fc9c1..d890a00 100644
         List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
 
 -- 
-2.4.6.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0063-ChunkMap-caching.patch
+++ b/Spigot-Server-Patches/0063-ChunkMap-caching.patch
@ -1,11 +1,11 @@
-From f3941c39661065a2384905328005c8699efbb9f9 Mon Sep 17 00:00:00 2001
+From 1d1449525b20f6bcbf8a08a25d07216b8a577976 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 15 Jul 2015 02:41:12 -0700
 Subject: [PATCH] ChunkMap caching


 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ab4de94..d5f13c0 100644
+index 5a3b22a..7efacfa 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -50,6 +50,49 @@ public class Chunk {
@ -121,7 +121,7 @@ index 10c0e34..00c0538 100644
             this.a[j] = chunk.locX;
             this.b[j] = chunk.locZ;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 9c8a01b..cde11b2 100644
+index 12697ff..49104ff 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -390,4 +390,10 @@ public class PaperSpigotWorldConfig
@ -136,5 +136,5 @@ index 9c8a01b..cde11b2 100644
 +    }
 }
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0064-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0064-Send-absolute-position-the-first-time-an-entity-is-s.patch
@ -1,4 +1,4 @@
-From 9cb32ededdc1ae3b2d844daabab50b0e844a96ce Mon Sep 17 00:00:00 2001
+From b35952787f9889c808ac29d48488e352aa19a5ca Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 3 Apr 2015 17:26:21 -0400
 Subject: [PATCH] Send absolute position the first time an entity is seen
@ -84,5 +84,5 @@ index f0149bf..b77de55 100644
                     Packet packet = this.c();
 
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0065-Optimize-Spigot-s-Anti-X-Ray.patch
+++ b/Spigot-Server-Patches/0065-Optimize-Spigot-s-Anti-X-Ray.patch
@ -1,11 +1,11 @@
-From 902c3277bf0160786ae839f700e3d390edb9c713 Mon Sep 17 00:00:00 2001
+From bf2f6dad61966f70291298653d34b657a1e061b4 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Thu, 23 Jul 2015 04:23:23 -0700
 Subject: [PATCH] Optimize Spigot's Anti X-Ray


 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a6452bb..b8c336f 100644
+index 06c7057..fb16a8a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -252,6 +252,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -17,7 +17,7 @@ index a6452bb..b8c336f 100644
         timings.doChunkMap.startTiming(); // Spigot
         this.manager.flush();
 diff --git a/src/main/java/org/spigotmc/AntiXray.java b/src/main/java/org/spigotmc/AntiXray.java
-index 6f28cd8..a59583e 100644
+index 7221b50..5466a61 100644
 --- a/src/main/java/org/spigotmc/AntiXray.java
 +++ b/src/main/java/org/spigotmc/AntiXray.java
@@ -8,6 +8,11 @@ import net.minecraft.server.Blocks;
@ -84,5 +84,5 @@ index 6f28cd8..a59583e 100644
             updateNearbyBlocks( world, position, 2, false ); // 2 is the radius, we shouldn't change it as that would make it exponentially slower
             update.stopTiming();
 -- 
-1.9.5.msysgit.1
+2.5.1

--- a/Spigot-Server-Patches/0066-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0066-Add-BeaconEffectEvent.patch
@ -1,4 +1,4 @@
-From c44a6dba8b52c5fa6e889cb015be4ee2ae946586 Mon Sep 17 00:00:00 2001
+From 4f8142d492a3cf372f484d2c5e8966221c4da0df Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Thu, 23 Jul 2015 12:44:06 -0700
 Subject: [PATCH] Add BeaconEffectEvent
@ -62,5 +62,5 @@ index 3ea1b62..a24dc68 100644
             }
         }
 -- 
-2.4.5.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0067-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0067-Configurable-container-update-tick-rate.patch
@ -1,11 +1,11 @@
-From 8eb107a8af1324f3431a30eedc601bb723d53eda Mon Sep 17 00:00:00 2001
+From ec4feced964f30c47aa7002c4fb914f2e8b4e23d Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 23 Jul 2015 22:05:22 -0700
 Subject: [PATCH] Configurable container update tick rate


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4631ca1..1a2484d 100644
+index 3e4869b..0c49a25 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -65,6 +65,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -33,7 +33,7 @@ index 4631ca1..1a2484d 100644
             this.closeInventory();
             this.activeContainer = this.defaultContainer;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index cde11b2..bd1b363 100644
+index 49104ff..84cdb12 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -396,4 +396,10 @@ public class PaperSpigotWorldConfig
@ -48,5 +48,5 @@ index cde11b2..bd1b363 100644
 +    }
 }
 -- 
-2.4.5.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0068-Configurable-TNT-explosion-volume.patch
+++ b/Spigot-Server-Patches/0068-Configurable-TNT-explosion-volume.patch
@ -1,4 +1,4 @@
-From 3c3dbe0aa96bc079b72af96ec63ec2d48a98f634 Mon Sep 17 00:00:00 2001
+From ab30baecc311d8f631b78608037e2bf04ab84db2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 4 Aug 2015 17:45:00 -0700
 Subject: [PATCH] Configurable TNT explosion volume
--- a/Spigot-Server-Patches/0069-Fix-lava-water-some-times-creating-air-instead-of-co.patch
+++ b/Spigot-Server-Patches/0069-Fix-lava-water-some-times-creating-air-instead-of-co.patch
@ -1,4 +1,4 @@
-From 4d013f6903f9ed1106967f8ae5121589277f0ebd Mon Sep 17 00:00:00 2001
+From dd49481b08dafe6d66cd27584b1e686fb3bc8d66 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Tue, 4 Aug 2015 18:15:05 -0700
 Subject: [PATCH] Fix lava/water some times creating air instead of cobblestone
@ -18,5 +18,5 @@ index b610450..db73f5d 100644
                     this.fizz(world, blockposition);
                     return true;
 -- 
-2.4.6.windows.1
+2.5.1

--- a/Spigot-Server-Patches/0070-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0070-Use-UserCache-for-player-heads.patch
@ -1,4 +1,4 @@
-From af94e290f2676a9b138658b543a939906cc8b693 Mon Sep 17 00:00:00 2001
+From 0f4e46792341188dde721938d5eefb995c64620b Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 7 Aug 2015 19:31:31 -0700
 Subject: [PATCH] Use UserCache for player heads
@ -33,5 +33,5 @@ index ce5425f..25e32a0 100644
 
         return true;
 -- 
-2.5.0
+2.5.1

--- a/Spigot-Server-Patches/0071-Re-add-Spigot-s-hopper-check-feature.patch
+++ b/Spigot-Server-Patches/0071-Re-add-Spigot-s-hopper-check-feature.patch
@ -1,4 +1,4 @@
-From 995af2343bce99345414b23395d8ae3e88c957f6 Mon Sep 17 00:00:00 2001
+From 5b5176fc7d474434fd33560ecc66eeebbc607f8f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Thu, 13 Aug 2015 10:33:34 -0700
 Subject: [PATCH] Re-add Spigot's hopper-check feature
@ -36,5 +36,5 @@ index 3f8bffc..7d46f2c 100644
 +    }
 }
 -- 
-2.4.6.windows.1
+2.5.1