diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
index 54573c579a..925802f082 100644
--- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
+++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
@@ -1,14 +1,14 @@
-From b0bbe96b13f89c92ddce9cda774346b2fb587fa4 Mon Sep 17 00:00:00 2001
+From ada098670b08f107d5ac8f7d10f3143cb9287d88 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 8 Aug 2014 22:51:26 -0500
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e3dd596..9d23835 100644
+index 9508e84..f93dcec 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1140,6 +1140,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1161,6 +1161,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
@@ -38,5 +38,5 @@ index e3dd596..9d23835 100644
  
      Spigot spigot();
 -- 
-2.4.3.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-API-Patches/0005-Add-getTPS-method.patch b/Spigot-API-Patches/0005-Add-getTPS-method.patch
index 73cb16e093..c9f4325328 100644
--- a/Spigot-API-Patches/0005-Add-getTPS-method.patch
+++ b/Spigot-API-Patches/0005-Add-getTPS-method.patch
@@ -1,15 +1,15 @@
-From a4c18f9cef6b6f29ef814ae4ac2583a8c079b21c Mon Sep 17 00:00:00 2001
+From bd975a633175f8370377c775a4f2ac6192ea7bd9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
 Date: Sun, 19 Oct 2014 18:22:18 -0500
 Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 20edb77..5a0d32f 100644
+index d9ad0ca..a7fafb2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -937,6 +937,13 @@ public interface Server extends PluginMessageRecipient {
-         public void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
+@@ -944,6 +944,13 @@ public interface Server extends PluginMessageRecipient {
+         public void restart() {
              throw new UnsupportedOperationException("Not supported yet.");
          }
 +
diff --git a/Spigot-API-Patches/0011-Add-player-view-distance-API.patch b/Spigot-API-Patches/0011-Add-player-view-distance-API.patch
index efc1870eba..f5e7b5540f 100644
--- a/Spigot-API-Patches/0011-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0011-Add-player-view-distance-API.patch
@@ -1,14 +1,14 @@
-From 53ad29ca507c248633ae0e1e2b0c9ecde5569891 Mon Sep 17 00:00:00 2001
+From 4159fb44e468dfea3813b86d3c69956393ec8dde Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 1 Jul 2015 00:59:50 -0700
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9d23835..53abb36 100644
+index f93dcec..7522d45 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1162,6 +1162,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1183,6 +1183,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet" );
          }
diff --git a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch
index 81b7eeb176..ce00cab629 100644
--- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch
+++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch
@@ -1,11 +1,11 @@
-From 185afbb2201ab2cc12ae0f8d15f8cdc173695fe2 Mon Sep 17 00:00:00 2001
+From a898a29d702635a9a745cde1c263de3f0dadbc1d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 May 2015 00:08:15 -0500
 Subject: [PATCH] PaperSpigot config files
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8303441..bc03bb3 100644
+index 7a8ce4a..9975f18 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -177,6 +177,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -20,7 +20,7 @@ index 8303441..bc03bb3 100644
              DedicatedServer.LOGGER.info("Generating keypair");
              this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ad0ee74..350bd0d 100644
+index 0271b19..822ddeb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -161,6 +161,8 @@ public abstract class World implements IBlockAccess {
@@ -41,10 +41,10 @@ index ad0ee74..350bd0d 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fd41124..cc0626f 100644
+index df34ddc..8b4fc89 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -689,6 +689,7 @@ public final class CraftServer implements Server {
+@@ -687,6 +687,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -52,7 +52,7 @@ index fd41124..cc0626f 100644
          for (WorldServer world : console.worlds) {
              world.worldData.setDifficulty(difficulty);
              world.setSpawnFlags(monsters, animals);
-@@ -704,12 +705,14 @@ public final class CraftServer implements Server {
+@@ -702,12 +703,14 @@ public final class CraftServer implements Server {
                  world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
              }
              world.spigotConfig.init(); // Spigot
diff --git a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
index af0f6af49d..13b69d118f 100644
--- a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
@@ -1,4 +1,4 @@
-From 5eba83b399ef2be6205f772a5824876c88f45a8d Mon Sep 17 00:00:00 2001
+From a77ebbd5e6e27cd51a1062001b905cfc686b90a3 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
@@ -65,7 +65,7 @@ index 3964e3f..611b8fd 100644
                                                          biomebase_biomemeta = worldserver.a(enumcreaturetype, blockposition2);
                                                          if (biomebase_biomemeta == null) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8bcb4ad..fae5eb7 100644
+index 03eb5f2..641db2a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,35 +2,23 @@ package net.minecraft.server;
@@ -112,7 +112,7 @@ index 8bcb4ad..fae5eb7 100644
  // CraftBukkit end
  
  public abstract class World implements IBlockAccess {
-@@ -2814,6 +2802,53 @@ public abstract class World implements IBlockAccess {
+@@ -2807,6 +2795,53 @@ public abstract class World implements IBlockAccess {
          return false;
      }
  
@@ -167,7 +167,7 @@ index 8bcb4ad..fae5eb7 100644
          for (int i = 0; i < this.players.size(); ++i) {
              EntityHuman entityhuman = (EntityHuman) this.players.get(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d0312a7..07aaec1 100644
+index 35608b7..a9b4160 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -7,6 +7,7 @@ import io.netty.buffer.Unpooled;
@@ -178,7 +178,7 @@ index d0312a7..07aaec1 100644
  import java.net.InetSocketAddress;
  import java.net.SocketAddress;
  import java.util.ArrayList;
-@@ -1456,6 +1457,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1470,6 +1471,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -198,5 +198,5 @@ index d0312a7..07aaec1 100644
  
      public Player.Spigot spigot()
 -- 
-2.4.3.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0020-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch b/Spigot-Server-Patches/0020-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch
index ae441a1fcf..57809e21bb 100644
--- a/Spigot-Server-Patches/0020-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch
+++ b/Spigot-Server-Patches/0020-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch
@@ -1,4 +1,4 @@
-From e1282376a286df21f984c03807f8aa4bf0b4a172 Mon Sep 17 00:00:00 2001
+From 83c0be0ad5802b5f28be0bbe0e01796a45948e1a 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,10 +6,10 @@ 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 7580b47..1ded833 100644
+index bc98e1f..1061088 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1026,7 +1026,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1022,7 +1022,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      }
  
      public String getServerModName() {
@@ -19,5 +19,5 @@ index 7580b47..1ded833 100644
  
      public CrashReport b(CrashReport crashreport) {
 -- 
-2.4.1.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0028-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0028-Further-improve-server-tick-loop.patch
index 14d0122a13..dfc946fcb2 100644
--- a/Spigot-Server-Patches/0028-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0028-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From b378f58c12647c892b0af373d813d8ac073e3f1a Mon Sep 17 00:00:00 2001
+From f92b84536fcd930f5160039476dfae760c550645 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
@@ -12,10 +12,10 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 87e8ff2..8a71423 100644
+index 1061088..a66ea75 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -115,17 +115,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -111,17 +111,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      public org.bukkit.command.ConsoleCommandSender console;
      public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
      public ConsoleReader reader;
@@ -34,7 +34,7 @@ index 87e8ff2..8a71423 100644
  
      public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
          io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
-@@ -516,12 +510,53 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -512,12 +506,53 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.isRunning = false;
      }
  
@@ -93,7 +93,7 @@ index 87e8ff2..8a71423 100644
   
      public void run() {
          try {
-@@ -534,26 +569,43 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -530,26 +565,43 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  this.a(this.r);
  
                  // Spigot start
@@ -150,10 +150,10 @@ index 87e8ff2..8a71423 100644
                      lastTick = curTime;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cc0626f..46bc341 100644
+index 8b4fc89..ca9c4a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1700,6 +1700,17 @@ public final class CraftServer implements Server {
+@@ -1698,6 +1698,17 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
diff --git a/Spigot-Server-Patches/0029-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0029-Only-refresh-abilities-if-needed.patch
index 48d4704d64..b16b63de77 100644
--- a/Spigot-Server-Patches/0029-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0029-Only-refresh-abilities-if-needed.patch
@@ -1,14 +1,14 @@
-From f157ea7c4424311ec0fd7ab9a901a4bbc8edf10c Mon Sep 17 00:00:00 2001
+From d9dab96eab52fcfed9c788818d0298a743da2932 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8fd876f..6342de7 100644
+index a9b4160..506a03c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1148,12 +1148,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1143,12 +1143,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
@@ -24,5 +24,5 @@ index 8fd876f..6342de7 100644
  
      @Override
 -- 
-2.4.2.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0031-Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/0030-Configurable-game-mechanics-changes.patch
similarity index 98%
rename from Spigot-Server-Patches/0031-Configurable-game-mechanics-changes.patch
rename to Spigot-Server-Patches/0030-Configurable-game-mechanics-changes.patch
index ede5cfe9c5..208900135a 100644
--- a/Spigot-Server-Patches/0031-Configurable-game-mechanics-changes.patch
+++ b/Spigot-Server-Patches/0030-Configurable-game-mechanics-changes.patch
@@ -1,4 +1,4 @@
-From 6c5e2e0b943ed4311fe1a44494f2adc860ca73df Mon Sep 17 00:00:00 2001
+From e07e85b7558bde9b523c28990d157aab02baa589 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
diff --git a/Spigot-Server-Patches/0030-Player-lookup-improvements.patch b/Spigot-Server-Patches/0030-Player-lookup-improvements.patch
deleted file mode 100644
index 8ba87629d2..0000000000
--- a/Spigot-Server-Patches/0030-Player-lookup-improvements.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 92736fc7145b3f862bbd072e258bf9edf7947447 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 8 Mar 2015 04:03:56 -0500
-Subject: [PATCH] Player lookup improvements
-
-Minecraft and CraftBukkit both use Arrays to store online players,
-and any time a player needs to be looked up by name or UUID,
-the system iterates all online players and does a name or UUID comparison.
-
-This is very ineffecient and can reduce performance on servers with high player count.
-
-By using a map based approach for player lookups, player lookup should
-be consistent in performance regardless of how many players are online.
-
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ab1d9a5..617f26c 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -49,6 +49,31 @@ public abstract class PlayerList {
-     private static final SimpleDateFormat g = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
-     private final MinecraftServer server;
-     public final List<EntityPlayer> players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety
-+    // PaperSpigot start - Player lookup improvements
-+    public final Map<String, EntityPlayer> playerMap = new java.util.HashMap<String, EntityPlayer>() {
-+        @Override
-+        public EntityPlayer put(String key, EntityPlayer value) {
-+            return super.put(key.toLowerCase(), value);
-+        }
-+
-+        @Override
-+        public EntityPlayer get(Object key) {
-+            // put the .playerConnection check done in other places here
-+            EntityPlayer player = super.get(key instanceof String ? ((String) key).toLowerCase() : key);
-+            return (player != null && player.playerConnection != null) ? player : null;
-+        }
-+
-+        @Override
-+        public boolean containsKey(Object key) {
-+            return get(key) != null;
-+        }
-+
-+        @Override
-+        public EntityPlayer remove(Object key) {
-+            return super.remove(key instanceof String ? ((String) key).toLowerCase() : key);
-+        }
-+    };
-+    // PaperSpigot end
-     private final Map<UUID, EntityPlayer> j = Maps.newHashMap();
-     private final GameProfileBanList k;
-     private final IpBanList l;
-@@ -287,6 +312,7 @@ public abstract class PlayerList {
- 
-     public void onPlayerJoin(EntityPlayer entityplayer, String joinMessage) { // CraftBukkit added param
-         this.players.add(entityplayer);
-+        this.playerMap.put(entityplayer.getName(), entityplayer); // PaperSpigot
-         this.j.put(entityplayer.getUniqueID(), entityplayer);
-         // this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer})); // CraftBukkit - replaced with loop below
-         WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
-@@ -358,6 +384,7 @@ public abstract class PlayerList {
-         worldserver.kill(entityplayer);
-         worldserver.getPlayerChunkMap().removePlayer(entityplayer);
-         this.players.remove(entityplayer);
-+        this.playerMap.remove(entityplayer.getName()); // PaperSpigot
-         UUID uuid = entityplayer.getUniqueID();
-         EntityPlayer entityplayer1 = (EntityPlayer) this.j.get(uuid);
- 
-@@ -395,6 +422,8 @@ public abstract class PlayerList {
- 
-         EntityPlayer entityplayer;
- 
-+        // PaperSpigot start - Use exact lookup below
-+        /*
-         for (int i = 0; i < this.players.size(); ++i) {
-             entityplayer = (EntityPlayer) this.players.get(i);
-             if (entityplayer.getUniqueID().equals(uuid)) {
-@@ -406,6 +435,9 @@ public abstract class PlayerList {
- 
-         while (iterator.hasNext()) {
-             entityplayer = (EntityPlayer) iterator.next();
-+        */
-+        if ((entityplayer = this.a(uuid)) != null) {
-+        // PaperSpigot end
-             savePlayerFile(entityplayer); // CraftBukkit - Force the player's inventory to be saved
-             entityplayer.playerConnection.disconnect("You logged in from another location");
-         }
-@@ -1020,6 +1052,7 @@ public abstract class PlayerList {
-     }
- 
-     public EntityPlayer getPlayer(String s) {
-+        if (true) { return playerMap.get(s); } // PaperSpigot
-         Iterator iterator = this.players.iterator();
- 
-         EntityPlayer entityplayer;
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 8be0698..4a908c6 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-@@ -144,14 +144,10 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
-     }
- 
-     public Player getPlayer() {
--        for (Object obj : server.getHandle().players) {
--            EntityPlayer player = (EntityPlayer) obj;
--            if (player.getUniqueID().equals(getUniqueId())) {
--                return (player.playerConnection != null) ? player.playerConnection.getPlayer() : null;
--            }
--        }
--
--        return null;
-+        // PaperSpigot - Improved player lookup, replace entire method
-+        final EntityPlayer playerEntity = server.getHandle().a(getUniqueId());
-+        return playerEntity != null ? playerEntity.getBukkitEntity() : null;
-+        // PaperSpigot end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 46bc341..b62a6a2 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -401,7 +401,12 @@ public final class CraftServer implements Server {
-     public Player getPlayer(final String name) {
-         Validate.notNull(name, "Name cannot be null");
- 
--        Player found = null;
-+        // PaperSpigot start - Improved player lookup changes
-+        Player found = getPlayerExact(name);
-+        if (found != null) {
-+            return found;
-+        }
-+        // PaperSpigot end
-         String lowerName = name.toLowerCase();
-         int delta = Integer.MAX_VALUE;
-         for (Player player : getOnlinePlayers()) {
-@@ -422,15 +427,10 @@ public final class CraftServer implements Server {
-     public Player getPlayerExact(String name) {
-         Validate.notNull(name, "Name cannot be null");
- 
--        String lname = name.toLowerCase();
--
--        for (Player player : getOnlinePlayers()) {
--            if (player.getName().equalsIgnoreCase(lname)) {
--                return player;
--            }
--        }
--
--        return null;
-+        // PaperSpigot start - Improved player lookup, replace whole method
-+        EntityPlayer player = playerList.playerMap.get(name);
-+        return player != null ? player.getBukkitEntity() : null;
-+        // PaperSpigot end
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6342de7..68f18d1 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -106,13 +106,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     }
- 
-     public boolean isOnline() {
--        for (Object obj : server.getHandle().players) {
--            EntityPlayer player = (EntityPlayer) obj;
--            if (player.getName().equalsIgnoreCase(getName())) {
--                return true;
--            }
--        }
--        return false;
-+        return server.getHandle().a(getUniqueId()) != null; // PaperSpigot - replace whole method
-     }
- 
-     public InetSocketAddress getAddress() {
--- 
-2.4.2.windows.1
-
diff --git a/Spigot-Server-Patches/0032-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0031-Add-async-chunk-load-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0032-Add-async-chunk-load-API.patch
rename to Spigot-Server-Patches/0031-Add-async-chunk-load-API.patch
index c064d5dc49..783a21e43d 100644
--- a/Spigot-Server-Patches/0032-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0031-Add-async-chunk-load-API.patch
@@ -1,11 +1,11 @@
-From d75ed57ede3da98d25c9f78d2c6f0251832db8c0 Mon Sep 17 00:00:00 2001
+From 4c36ad5483d3c75a3e9588e208e3012f472eb726 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 89163ea..39423d2 100644
+index c1d552a..da84cd5 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 89163ea..39423d2 100644
          return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk;
      }
 -- 
-2.4.3.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0033-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch b/Spigot-Server-Patches/0032-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch
similarity index 93%
rename from Spigot-Server-Patches/0033-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch
rename to Spigot-Server-Patches/0032-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch
index 62e760a7f5..cd5b83f396 100644
--- a/Spigot-Server-Patches/0033-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch
+++ b/Spigot-Server-Patches/0032-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch
@@ -1,11 +1,11 @@
-From e6897370898bf85f873be3cc8e83a7cac16972dc Mon Sep 17 00:00:00 2001
+From e1554354226977651da048151eaf50edbd8cb30a 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 1984e7c..e6b557e 100644
+index dbef942..2fc2698 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;
@@ -17,7 +17,7 @@ index 1984e7c..e6b557e 100644
  public final class ItemStack {
  
      public static final DecimalFormat a = new DecimalFormat("#.###");
-@@ -320,9 +322,13 @@ public final class ItemStack {
+@@ -321,9 +323,13 @@ public final class ItemStack {
          }
  
          // Is this a block?
@@ -34,7 +34,7 @@ index 1984e7c..e6b557e 100644
              }
          }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
-index 815ad97..3ab2892 100644
+index 5ff1c26..ab21bbf 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;
@@ -64,5 +64,5 @@ index 815ad97..3ab2892 100644
 +    }
  }
 -- 
-2.4.1.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0034-Add-TNT-source-location-API.patch b/Spigot-Server-Patches/0033-Add-TNT-source-location-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0034-Add-TNT-source-location-API.patch
rename to Spigot-Server-Patches/0033-Add-TNT-source-location-API.patch
index 634369cf88..f2e83fe918 100644
--- a/Spigot-Server-Patches/0034-Add-TNT-source-location-API.patch
+++ b/Spigot-Server-Patches/0033-Add-TNT-source-location-API.patch
@@ -1,4 +1,4 @@
-From ae17028cabb06028ba0d90caf89b34cbcc421ca2 Mon Sep 17 00:00:00 2001
+From 1c34c74c0497f33ab2bc59c7d101d6353d8bd799 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
@@ -128,5 +128,5 @@ index e08ad47..b7e8b4d 100644
 +    // PaperSpigot end
  }
 -- 
-2.4.4.windows.2
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0035-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0034-Prevent-tile-entity-and-entity-crashes.patch
similarity index 97%
rename from Spigot-Server-Patches/0035-Prevent-tile-entity-and-entity-crashes.patch
rename to Spigot-Server-Patches/0034-Prevent-tile-entity-and-entity-crashes.patch
index 0acb359b06..c10a4ed73a 100644
--- a/Spigot-Server-Patches/0035-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0034-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,4 +1,4 @@
-From 920f92b1b9e44d02502394da6ffe1062fcadf453 Mon Sep 17 00:00:00 2001
+From 3a5f22368dab9706d143d558df225a0be5da593e 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
@@ -23,7 +23,7 @@ index 1971941..d258604 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 530e60f..51e59c0 100644
+index 624352c..915a02d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1409,10 +1409,13 @@ public abstract class World implements IBlockAccess {
@@ -64,5 +64,5 @@ index 530e60f..51e59c0 100644
                      // Spigot start
                      finally {
 -- 
-2.4.1.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0036-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0035-Configurable-top-of-nether-void-damage.patch
similarity index 95%
rename from Spigot-Server-Patches/0036-Configurable-top-of-nether-void-damage.patch
rename to Spigot-Server-Patches/0035-Configurable-top-of-nether-void-damage.patch
index e7c0d27a22..7949bbef62 100644
--- a/Spigot-Server-Patches/0036-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0035-Configurable-top-of-nether-void-damage.patch
@@ -1,11 +1,11 @@
-From d481a7ac79cc1e1e882a187979ce1151ce424297 Mon Sep 17 00:00:00 2001
+From 217c02646bdc15d5f6907cd1aae4437e05b47bf7 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1470c21..79837ef 100644
+index 0234ad3..2611007 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -247,6 +247,13 @@ public abstract class Entity implements ICommandListener {
diff --git a/Spigot-Server-Patches/0037-Enderman-drop-the-block-they-re-holding-when-they-di.patch b/Spigot-Server-Patches/0036-Enderman-drop-the-block-they-re-holding-when-they-di.patch
similarity index 91%
rename from Spigot-Server-Patches/0037-Enderman-drop-the-block-they-re-holding-when-they-di.patch
rename to Spigot-Server-Patches/0036-Enderman-drop-the-block-they-re-holding-when-they-di.patch
index 3ded8c6e25..4b44ac4926 100644
--- a/Spigot-Server-Patches/0037-Enderman-drop-the-block-they-re-holding-when-they-di.patch
+++ b/Spigot-Server-Patches/0036-Enderman-drop-the-block-they-re-holding-when-they-di.patch
@@ -1,4 +1,4 @@
-From 8fd0f064dd0d98161766cbb06024907e6a1b5a4a Mon Sep 17 00:00:00 2001
+From 18351b1718062abf74c518550b3a015e92b2147a 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) {
 -- 
-2.4.1.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0038-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0037-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 94%
rename from Spigot-Server-Patches/0038-Check-online-mode-before-converting-and-renaming-pla.patch
rename to Spigot-Server-Patches/0037-Check-online-mode-before-converting-and-renaming-pla.patch
index 7bae1339f7..34b79b6de5 100644
--- a/Spigot-Server-Patches/0038-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0037-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -1,4 +1,4 @@
-From 21d58890ad896dabf7f4f9ec7673f25f9d456154 Mon Sep 17 00:00:00 2001
+From 6375d90d6df3c87a9bfb783c07e2bf7333737390 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
diff --git a/Spigot-Server-Patches/0039-Fix-redstone-lag-issues.patch b/Spigot-Server-Patches/0038-Fix-redstone-lag-issues.patch
similarity index 97%
rename from Spigot-Server-Patches/0039-Fix-redstone-lag-issues.patch
rename to Spigot-Server-Patches/0038-Fix-redstone-lag-issues.patch
index c761f8477d..14052b46f6 100644
--- a/Spigot-Server-Patches/0039-Fix-redstone-lag-issues.patch
+++ b/Spigot-Server-Patches/0038-Fix-redstone-lag-issues.patch
@@ -1,11 +1,11 @@
-From 731e657bf28c20f22e0efa05cf1cc9664374e9e8 Mon Sep 17 00:00:00 2001
+From cc1ca0b2afe1d8eb6dc140173f5eb2f1fe6c1a74 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 d76b965..7624984 100644
+index 6755143..59296d0 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 {
diff --git a/Spigot-Server-Patches/0040-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0039-Always-tick-falling-blocks.patch
similarity index 95%
rename from Spigot-Server-Patches/0040-Always-tick-falling-blocks.patch
rename to Spigot-Server-Patches/0039-Always-tick-falling-blocks.patch
index 9f0f38e00c..42b7e4af19 100644
--- a/Spigot-Server-Patches/0040-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0039-Always-tick-falling-blocks.patch
@@ -1,4 +1,4 @@
-From c1a44d6af5951474105fbf073f2e23baefd130af Mon Sep 17 00:00:00 2001
+From 97c465a59fc4f6a14819ca31b670aedfbbd3709e 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
diff --git a/Spigot-Server-Patches/0041-Add-FallingBlock-source-location-API.patch b/Spigot-Server-Patches/0040-Add-FallingBlock-source-location-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0041-Add-FallingBlock-source-location-API.patch
rename to Spigot-Server-Patches/0040-Add-FallingBlock-source-location-API.patch
index 0a3bc5a01c..6db11d9c58 100644
--- a/Spigot-Server-Patches/0041-Add-FallingBlock-source-location-API.patch
+++ b/Spigot-Server-Patches/0040-Add-FallingBlock-source-location-API.patch
@@ -1,4 +1,4 @@
-From ff43f17197527991ea1a261b7137e23c4dbe087d Mon Sep 17 00:00:00 2001
+From 15c06856e7b75ae48b44b56200fa2e537dafd218 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
@@ -141,5 +141,5 @@ index 788f26b..f2dfedd 100644
 +    // PaperSpigot end
  }
 -- 
-2.4.4.windows.2
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0042-Configurable-async-light-updates.patch b/Spigot-Server-Patches/0041-Configurable-async-light-updates.patch
similarity index 98%
rename from Spigot-Server-Patches/0042-Configurable-async-light-updates.patch
rename to Spigot-Server-Patches/0041-Configurable-async-light-updates.patch
index 08fb97d952..37871fe5be 100644
--- a/Spigot-Server-Patches/0042-Configurable-async-light-updates.patch
+++ b/Spigot-Server-Patches/0041-Configurable-async-light-updates.patch
@@ -1,4 +1,4 @@
-From cc4cc3c5874b1cdd1f1a1e5488d6b729f3b303ec Mon Sep 17 00:00:00 2001
+From 8a61969c23ac2a0c49898281c8e0c3a9560b8ab1 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
@@ -55,7 +55,7 @@ index 975d666..ae0f276 100644
              if (!this.world.c(i, j)) {
                  // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b681a9f..8ee0cec 100644
+index 915a02d..b66dd81 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,6 +18,12 @@ import org.bukkit.generator.ChunkGenerator;
diff --git a/Spigot-Server-Patches/0043-Optimize-draining.patch b/Spigot-Server-Patches/0042-Optimize-draining.patch
similarity index 95%
rename from Spigot-Server-Patches/0043-Optimize-draining.patch
rename to Spigot-Server-Patches/0042-Optimize-draining.patch
index 621e7bae59..913e5c7b54 100644
--- a/Spigot-Server-Patches/0043-Optimize-draining.patch
+++ b/Spigot-Server-Patches/0042-Optimize-draining.patch
@@ -1,4 +1,4 @@
-From d565e087226347aaebf3a1322b0fc9c64e5f706a Mon Sep 17 00:00:00 2001
+From 1de69d5b502fa3bb7b18cb1ca7ec37689cde363a 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
diff --git a/Spigot-Server-Patches/0044-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0043-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 93%
rename from Spigot-Server-Patches/0044-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0043-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 3032bdabdd..bec877b5b3 100644
--- a/Spigot-Server-Patches/0044-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0043-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,11 +1,11 @@
-From 365e3440181bcd076813df0cb45f8a6b30ec72a3 Mon Sep 17 00:00:00 2001
+From 3772a5be518e8930b47c68d85379780ada09a3c0 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 8d2b3a1..961b53b 100644
+index 2a08976..18edb61 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 8d2b3a1..961b53b 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 f11ca71..3c011c2 100644
+index fa9ae6c..81438c3 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
diff --git a/Spigot-Server-Patches/0045-Add-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0044-Add-PlayerLocaleChangeEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0045-Add-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0044-Add-PlayerLocaleChangeEvent.patch
index f7f6052681..0ce2841fd9 100644
--- a/Spigot-Server-Patches/0045-Add-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0044-Add-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From 915d7b0216e0027dd72441eb46034459d714a83d Mon Sep 17 00:00:00 2001
+From 296b917ee20dde6f55318b38fe1910c911b06013 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 26b4f97..6ec167f 100644
+index 3438d3a..c268145 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,10 +23,10 @@ index 26b4f97..6ec167f 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 211c421..0950b8a 100644
+index c1085a0..046b87a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -950,4 +950,13 @@ public class CraftEventFactory {
+@@ -963,4 +963,13 @@ public class CraftEventFactory {
          entityHuman.world.getServer().getPluginManager().callEvent(event);
          return (Cancellable) event;
      }
diff --git a/Spigot-Server-Patches/0046-Fix-jar-being-shaded-multiple-times.patch b/Spigot-Server-Patches/0045-Fix-jar-being-shaded-multiple-times.patch
similarity index 89%
rename from Spigot-Server-Patches/0046-Fix-jar-being-shaded-multiple-times.patch
rename to Spigot-Server-Patches/0045-Fix-jar-being-shaded-multiple-times.patch
index 86d81e9392..54d05dc809 100644
--- a/Spigot-Server-Patches/0046-Fix-jar-being-shaded-multiple-times.patch
+++ b/Spigot-Server-Patches/0045-Fix-jar-being-shaded-multiple-times.patch
@@ -1,4 +1,4 @@
-From c5a5d26a0e6cb3a0b24fb5e34cd0b5e70080bcfa Mon Sep 17 00:00:00 2001
+From 6483c2495bccdc76b8a035aab0d340790e6d8c88 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
@@ -17,5 +17,5 @@ index bc0a4a6..1359743 100644
                          <manifestEntries>
                              <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
 -- 
-2.4.2.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0047-Configurable-end-credits-when-leaving-the-end.patch b/Spigot-Server-Patches/0046-Configurable-end-credits-when-leaving-the-end.patch
similarity index 95%
rename from Spigot-Server-Patches/0047-Configurable-end-credits-when-leaving-the-end.patch
rename to Spigot-Server-Patches/0046-Configurable-end-credits-when-leaving-the-end.patch
index 2a6ee929c1..f0d8876b0c 100644
--- a/Spigot-Server-Patches/0047-Configurable-end-credits-when-leaving-the-end.patch
+++ b/Spigot-Server-Patches/0046-Configurable-end-credits-when-leaving-the-end.patch
@@ -1,4 +1,4 @@
-From 36c08f6ff5fad0333451734342c43914b42244f1 Mon Sep 17 00:00:00 2001
+From 33ed2e63b8039296ed56504e90b03313e3821c9b 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
@@ -51,10 +51,10 @@ 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 617f26c..a698e84 100644
+index 461e3f9..1c549bb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -693,6 +693,8 @@ public abstract class PlayerList {
+@@ -666,6 +666,8 @@ public abstract class PlayerList {
          }
  
          TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().getTravelAgent() : org.bukkit.craftbukkit.CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins
@@ -63,7 +63,7 @@ index 617f26c..a698e84 100644
          PlayerPortalEvent event = new PlayerPortalEvent(entityplayer.getBukkitEntity(), enter, exit, agent, cause);
          event.useTravelAgent(useTravelAgent);
          Bukkit.getServer().getPluginManager().callEvent(event);
-@@ -700,7 +702,8 @@ public abstract class PlayerList {
+@@ -673,7 +675,8 @@ public abstract class PlayerList {
              return;
          }
  
diff --git a/Spigot-Server-Patches/0048-Force-load-chunks-for-specific-entities-that-fly-thr.patch b/Spigot-Server-Patches/0047-Force-load-chunks-for-specific-entities-that-fly-thr.patch
similarity index 99%
rename from Spigot-Server-Patches/0048-Force-load-chunks-for-specific-entities-that-fly-thr.patch
rename to Spigot-Server-Patches/0047-Force-load-chunks-for-specific-entities-that-fly-thr.patch
index a8ea7522af..aafb144282 100644
--- a/Spigot-Server-Patches/0048-Force-load-chunks-for-specific-entities-that-fly-thr.patch
+++ b/Spigot-Server-Patches/0047-Force-load-chunks-for-specific-entities-that-fly-thr.patch
@@ -1,4 +1,4 @@
-From 072da6782e7b7f003a4895afbbfd9d17dc73fe55 Mon Sep 17 00:00:00 2001
+From 0693755e94548a13ac3ffadc3830dc0a7fa240fe 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
@@ -137,7 +137,7 @@ index 1daba4e..3e16472 100644
  
      protected void b(NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8ee0cec..d8e3d87 100644
+index b66dd81..baedb39 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1163,8 +1163,14 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0049-Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/0048-Teleport-passenger-vehicle-with-player.patch
similarity index 94%
rename from Spigot-Server-Patches/0049-Teleport-passenger-vehicle-with-player.patch
rename to Spigot-Server-Patches/0048-Teleport-passenger-vehicle-with-player.patch
index f1160e990a..3c8a7e8096 100644
--- a/Spigot-Server-Patches/0049-Teleport-passenger-vehicle-with-player.patch
+++ b/Spigot-Server-Patches/0048-Teleport-passenger-vehicle-with-player.patch
@@ -1,4 +1,4 @@
-From f5631af64117c643683738ea863b7ccadd89313c Mon Sep 17 00:00:00 2001
+From de2d117505e212ebe0de8288f7ec4297bc4d923b 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
@@ -47,10 +47,10 @@ index f76c67d..70ac612 100644
                  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 5b99842..23753bb 100644
+index 506a03c..9612c79 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -449,7 +449,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -450,7 +450,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          // If this player is riding another entity, we must dismount before teleporting.
@@ -79,7 +79,7 @@ index 5b99842..23753bb 100644
  
          // Update the From Location
          from = event.getFrom();
-@@ -470,6 +490,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -471,6 +491,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          } else {
              server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
          }
diff --git a/Spigot-Server-Patches/0050-Stackable-Buckets.patch b/Spigot-Server-Patches/0049-Stackable-Buckets.patch
similarity index 99%
rename from Spigot-Server-Patches/0050-Stackable-Buckets.patch
rename to Spigot-Server-Patches/0049-Stackable-Buckets.patch
index d180a14086..4b082d0d58 100644
--- a/Spigot-Server-Patches/0050-Stackable-Buckets.patch
+++ b/Spigot-Server-Patches/0049-Stackable-Buckets.patch
@@ -1,4 +1,4 @@
-From 456deeeb09db90108d671cf1f8db3ccd4a2c0714 Mon Sep 17 00:00:00 2001
+From f1bb897a8ebdacde081f58eae9d3db7e93587bc8 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
@@ -170,5 +170,5 @@ index ab21bbf..aba8f87 100644
 +    }
  }
 -- 
-2.4.2.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0051-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0050-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0051-Fix-lag-from-explosions-processing-dead-entities.patch
rename to Spigot-Server-Patches/0050-Fix-lag-from-explosions-processing-dead-entities.patch
index b858de2953..4ed82e748b 100644
--- a/Spigot-Server-Patches/0051-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0050-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -1,4 +1,4 @@
-From 790447669c1b76aaf801a79bdce97b13ba4c8e33 Mon Sep 17 00:00:00 2001
+From a5968599f8a76073b633fd2c6fa8b0ee1d5d2ce2 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
@@ -25,5 +25,5 @@ index 85f2ab5..349854f 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.4.2.windows.1
+1.9.5.msysgit.1
 
diff --git a/Spigot-Server-Patches/0052-Generator-Settings.patch b/Spigot-Server-Patches/0051-Generator-Settings.patch
similarity index 99%
rename from Spigot-Server-Patches/0052-Generator-Settings.patch
rename to Spigot-Server-Patches/0051-Generator-Settings.patch
index eb56cbfba0..34b25e25ae 100644
--- a/Spigot-Server-Patches/0052-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0051-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From 2eefb422efbed501a33d2ecafd84e328931110f4 Mon Sep 17 00:00:00 2001
+From 32809f19984bf2b2a71f35f4e4394d804c9f6c55 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
diff --git a/Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch b/Spigot-Server-Patches/0052-Configurable-TNT-cannon-fix.patch
similarity index 99%
rename from Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch
rename to Spigot-Server-Patches/0052-Configurable-TNT-cannon-fix.patch
index cf38d2cd91..dae10c9b71 100644
--- a/Spigot-Server-Patches/0053-Configurable-TNT-cannon-fix.patch
+++ b/Spigot-Server-Patches/0052-Configurable-TNT-cannon-fix.patch
@@ -1,4 +1,4 @@
-From c88d7ecef2b00d2f2c9f649eba69cc58eba8c628 Mon Sep 17 00:00:00 2001
+From 3a9c2d48b5a6d4a3741f91aa8b46accbf7452537 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
diff --git a/Spigot-Server-Patches/0054-FallingBlock-and-TNT-entities-collide-with-specific-.patch b/Spigot-Server-Patches/0053-FallingBlock-and-TNT-entities-collide-with-specific-.patch
similarity index 93%
rename from Spigot-Server-Patches/0054-FallingBlock-and-TNT-entities-collide-with-specific-.patch
rename to Spigot-Server-Patches/0053-FallingBlock-and-TNT-entities-collide-with-specific-.patch
index 13257fd6b8..c5a4546451 100644
--- a/Spigot-Server-Patches/0054-FallingBlock-and-TNT-entities-collide-with-specific-.patch
+++ b/Spigot-Server-Patches/0053-FallingBlock-and-TNT-entities-collide-with-specific-.patch
@@ -1,14 +1,14 @@
-From c3b9b48c6c9c8580777de737a78f621ef7b3cd60 Mon Sep 17 00:00:00 2001
+From 36a7f30f47778a7c3d114efbad08f06c369ae7da 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 6712fbf..04bc301 100644
+index baedb39..e96fa6f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1197,7 +1197,16 @@ public abstract class World implements IBlockAccess {
+@@ -1203,7 +1203,16 @@ public abstract class World implements IBlockAccess {
                              }
                              if ( block != null )
                              {
diff --git a/Spigot-Server-Patches/0055-Optimize-explosions.patch b/Spigot-Server-Patches/0054-Optimize-explosions.patch
similarity index 97%
rename from Spigot-Server-Patches/0055-Optimize-explosions.patch
rename to Spigot-Server-Patches/0054-Optimize-explosions.patch
index ca8fd2f297..427e447de9 100644
--- a/Spigot-Server-Patches/0055-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0054-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 5e1ec44c0676857eedf38547f4750d98cdb700e8 Mon Sep 17 00:00:00 2001
+From 0de8fc2d43f4864027f86266e157d2d7009cfa55 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
@@ -110,10 +110,10 @@ index f40f465..4afb8d7 100644
 +    // PaperSpigot end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 77fe950..a3fb54b 100644
+index a66ea75..5c3518a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -859,6 +859,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -855,6 +855,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  worldserver.timings.tracker.stopTiming(); // Spigot
                  this.methodProfiler.b();
                  this.methodProfiler.b();
@@ -122,7 +122,7 @@ index 77fe950..a3fb54b 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 3ece597..c306035 100644
+index e96fa6f..294f54c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -133,6 +133,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0056-Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/0055-Stop-updating-flowing-block-if-material-has-changed.patch
similarity index 93%
rename from Spigot-Server-Patches/0056-Stop-updating-flowing-block-if-material-has-changed.patch
rename to Spigot-Server-Patches/0055-Stop-updating-flowing-block-if-material-has-changed.patch
index e871587ee4..067e958a7d 100644
--- a/Spigot-Server-Patches/0056-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0055-Stop-updating-flowing-block-if-material-has-changed.patch
@@ -1,4 +1,4 @@
-From fce49b25739325c050cb843e4394761e9d860562 Mon Sep 17 00:00:00 2001
+From a91dd11349c295d85d730ec226dbed76add3ca3d 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
diff --git a/Spigot-Server-Patches/0057-Fast-draining.patch b/Spigot-Server-Patches/0056-Fast-draining.patch
similarity index 98%
rename from Spigot-Server-Patches/0057-Fast-draining.patch
rename to Spigot-Server-Patches/0056-Fast-draining.patch
index a1a659b3e7..0c4c5f0999 100644
--- a/Spigot-Server-Patches/0057-Fast-draining.patch
+++ b/Spigot-Server-Patches/0056-Fast-draining.patch
@@ -1,4 +1,4 @@
-From f0ec2fb3eb0aea8c4baf86deef1e6c03b002fb3c Mon Sep 17 00:00:00 2001
+From 08a352192b00d7f4bc07986fb3aaf330d6d45d25 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
diff --git a/Spigot-Server-Patches/0058-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0057-Configurable-lava-flow-speed.patch
similarity index 95%
rename from Spigot-Server-Patches/0058-Configurable-lava-flow-speed.patch
rename to Spigot-Server-Patches/0057-Configurable-lava-flow-speed.patch
index 674e1b40c5..5667525d19 100644
--- a/Spigot-Server-Patches/0058-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0057-Configurable-lava-flow-speed.patch
@@ -1,11 +1,11 @@
-From 497fee67414ed7957c5bbc318c45e1789a877102 Mon Sep 17 00:00:00 2001
+From 78684996aa3b507362093ba5bc99a61205825eb6 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 33ff734..261d732 100644
+index fc3fc48..23130ba 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -276,6 +276,9 @@ public class BlockFlowing extends BlockFluids {
diff --git a/Spigot-Server-Patches/0059-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0058-Add-player-view-distance-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0059-Add-player-view-distance-API.patch
rename to Spigot-Server-Patches/0058-Add-player-view-distance-API.patch
index b33c171337..ecec79916f 100644
--- a/Spigot-Server-Patches/0059-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0058-Add-player-view-distance-API.patch
@@ -1,4 +1,4 @@
-From 5fdfe6ba2c21440aea2e5227e230f412d25d96ec Mon Sep 17 00:00:00 2001
+From 0ee891f55462310888c36e8f787ef799345490cb 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 23753bb..fc0809a 100644
+index 9612c79..8fdfdcf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1494,6 +1494,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1514,6 +1514,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              getHandle().affectsSpawning = affects;
          }
          // PaperSpigot end