Remove the broken teleport passenger vehicle with player patch

Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch

@@ -1,98 +0,0 @@
-From 47ddeac79b6d4daffa8e1d104d97691eb8fe7257 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 28 Nov 2014 00:24:18 -0600
-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 dfb4299..213a16b 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -40,6 +40,13 @@ public abstract class Entity implements ICommandListener {
-         return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
-     }
-     // 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;
-@@ -1941,7 +1948,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 - no... this entity is dead
-             worldserver1.chunkProviderServer.forceChunkLoad = before;
-             // CraftBukkit end
-             this.world.methodProfiler.c("reloading");
-@@ -1949,6 +1956,10 @@ public abstract class Entity implements ICommandListener {
- 
-             if (entity != null) {
-                 entity.n(this);
-+                // PaperSpigot start - 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 c315654..fd00596 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -453,7 +453,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
-+        entity.mount(null); // Comment out when fully working, until then leave this
-+
-+        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();
-@@ -474,6 +494,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         } else {
-             server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
-         }
-+
-+        // PaperSpigot start
-+        if (vehicle != null) {
-+            vehicle.retrack();
-+        }
-+
-+        if (passenger != null) {
-+            passenger.retrack();
-+        }
-+        // PaperSpigot end
-+
-         return true;
-     }
- 
--- 
-1.9.1
-

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

@@ -1,4 +1,4 @@
-From c65b186088762db0436f8b58604355ae8fbfebc5 Mon Sep 17 00:00:00 2001
+From e5fe004e7cdd8231eeefdfa9b380c94a809f96b4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 28 Nov 2014 00:35:56 -0600
 Subject: [PATCH] Vanished players don't have rights
@@ -75,5 +75,5 @@ index ac11b9a..bebf181 100644
                  return false;
              }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,4 +1,4 @@
-From 0979615299c39e333904637e88ad927d38b8e978 Mon Sep 17 00:00:00 2001
+From 2475b727707230bcf5e97c384ce2e5c512392afa Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 28 Nov 2014 00:41:04 -0600
 Subject: [PATCH] Configurable squid spawn ranges
@@ -37,5 +37,5 @@ index b9d1afe..f6b0349 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0007-Configurable-damage-multiplier-for-PvP-blocking.patch

@@ -1,11 +1,11 @@
-From c114520bb120e85f3c20fb412e49c606871133f6 Mon Sep 17 00:00:00 2001
+From 490c255eaa142d4712b7fb492d7ccb0fca59d408 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 28 Nov 2014 00:45:14 -0600
 Subject: [PATCH] Configurable damage multiplier for PvP blocking
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4ccd4d5..84ac6b2 100644
+index 00aa03d..876cf4e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -862,7 +862,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,5 +34,5 @@ index f6b0349..5cda463 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,11 +1,11 @@
-From aa6691415c68a0965b149456f31680ae26e5e56b Mon Sep 17 00:00:00 2001
+From 381b93978d20e3a2aa75108b6bd18c00dd4152d1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 28 Nov 2014 00:55:17 -0600
 Subject: [PATCH] Configurable cactus and reed natural growth heights
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 8569204..26cb10e 100644
+index d9f6e0b..d0b1bcf 100644
 --- a/src/main/java/net/minecraft/server/BlockCactus.java
 +++ b/src/main/java/net/minecraft/server/BlockCactus.java
 @@ -26,7 +26,7 @@ public class BlockCactus extends Block {
@@ -18,7 +18,7 @@ index 8569204..26cb10e 100644
  
                  if (j >= (byte) range(3, (world.growthOdds / world.spigotConfig.cactusModifier * 15) + 0.5F, 15)) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index 11631da..33806da 100644
+index 27b7f81..d04de80 100644
 --- a/src/main/java/net/minecraft/server/BlockReed.java
 +++ b/src/main/java/net/minecraft/server/BlockReed.java
 @@ -25,7 +25,7 @@ public class BlockReed extends Block {
@@ -49,5 +49,5 @@ index 5cda463..0878ea7 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,11 +1,11 @@
-From 3678c7ac6071f4c97d0efd7dab6f6c071ac1f4f4 Mon Sep 17 00:00:00 2001
+From f372b0402915aab3c5069327ff9e5e0a337a3978 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 28 Nov 2014 01:01:51 -0600
 Subject: [PATCH] Configurable baby zombie movement speed
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index d50ddd4..418c6da 100644
+index 3e6a101..b2d9e67 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -16,7 +16,8 @@ public class EntityZombie extends EntityMonster {
@@ -34,5 +34,5 @@ index 7ea1617..f4acbb3 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0010-Ability-to-disable-asynccatcher.patch

@@ -1,4 +1,4 @@
-From 78b47c601829196323f63810551203efb2620d88 Mon Sep 17 00:00:00 2001
+From 63fd30acfedd9886f2cd0baf86f8d335dd1199e2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 5 Aug 2014 17:39:04 -0500
 Subject: [PATCH] Ability to disable asynccatcher
@@ -36,5 +36,5 @@ index 4b3aa85..f7e8d16 100644
      public static void catchOp(String reason)
      {
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,4 +1,4 @@
-From 3b830fdaadabeb70ff6a2d9ff015308ad51f40e7 Mon Sep 17 00:00:00 2001
+From 47f9adf94abdfcb6fefd5a2efbbf3bcb172a2027 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Fri, 28 Nov 2014 01:21:27 -0600
 Subject: [PATCH] Fix redstone lag issues
@@ -31,5 +31,5 @@ index a61655f..34fd259 100644
                  this.methodProfiler.a("cleaning");
  
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0012-Do-not-remove-player-in-world-change.patch

@@ -1,11 +1,11 @@
-From f6381508cca1054a8c6714829d2c4a2a4e08a3c8 Mon Sep 17 00:00:00 2001
+From 5e437f19ad25e1bf79d005085db0a007387b23e0 Mon Sep 17 00:00:00 2001
 From: T00thpick1 <t00thpick1dirko@gmail.com>
 Date: Fri, 28 Nov 2014 01:25:45 -0600
 Subject: [PATCH] Do not remove player in world change
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 34ee440..383b113 100644
+index 3fabad4..c4b11c9 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -465,7 +465,7 @@ public abstract class PlayerList {
@@ -27,5 +27,5 @@ index 34ee440..383b113 100644
          }
          // Added from changeDimension
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0013-Fix-directional-TNT-bias.patch

@@ -1,4 +1,4 @@
-From 8d1a3aa8b453adcf1f354824229ef2245b015b9b Mon Sep 17 00:00:00 2001
+From 77ab7df400008e421f7415601732e94efcfc636d Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Fri, 11 Jul 2014 03:54:06 -0500
 Subject: [PATCH] Fix directional TNT bias
@@ -24,5 +24,5 @@ index 3621faf..4823698 100644
          this.lastX = d0;
          this.lastY = d1;
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,4 +1,4 @@
-From e8658be06e362eaaad09d04aefeeab0c4754cbad Mon Sep 17 00:00:00 2001
+From a219468eb44541f05fc0209db98f8f8b65bdc108 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 28 Nov 2014 01:29:35 -0600
 Subject: [PATCH] Configurable fishing time ranges
@@ -36,5 +36,5 @@ index 0878ea7..b67b856 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,11 +1,11 @@
-From b26b0d9d00ccc25cfbc39188d76b98cee220c713 Mon Sep 17 00:00:00 2001
+From 025da359b8d3bb8c4afcb13eb2a5830e78283097 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 29 Jun 2014 13:32:36 -0500
 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 bc7f81e..39800e5 100644
+index 214c0ca..196b45a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -454,6 +454,12 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -22,5 +22,5 @@ index bc7f81e..39800e5 100644
          }
          // Spigot End
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,11 +1,11 @@
-From 338da46a277535bbc036295e4d5cca1061a1e4ef Mon Sep 17 00:00:00 2001
+From deda4bb20fd6b6aa6839d3f5ffdcd92b8cac8d61 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 28 Nov 2014 01:33:25 -0600
 Subject: [PATCH] Toggle for player interact limiter
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 53f6de7..e8e3e5d 100644
+index 5c17e44..69efb4f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -626,7 +626,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -37,5 +37,5 @@ index 2cc159b..25a94a6 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,4 +1,4 @@
-From 8305f28f6bc66b5a1fa4246a85d32e2998d2c865 Mon Sep 17 00:00:00 2001
+From 354488007bdff51cbc37667320cfeb68432de2cd Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Fri, 28 Nov 2014 01:41:54 -0600
 Subject: [PATCH] Player Exhaustion Multipliers
@@ -18,7 +18,7 @@ index 9a19752..32d678d 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 84ac6b2..32199f1 100644
+index 876cf4e..2bc2ef6 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1371,13 +1371,13 @@ public abstract class EntityHuman extends EntityLiving {
@@ -55,5 +55,5 @@ index b67b856..1b8683a 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,11 +1,11 @@
-From 9fce5b162ea77e577894a188678115c96e5f3021 Mon Sep 17 00:00:00 2001
+From eebbac57234fdb36d364372ad595d354f3ed09b9 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Fri, 28 Nov 2014 01:49:53 -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 39800e5..4755489 100644
+index 196b45a..71d4249 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -432,13 +432,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -61,5 +61,5 @@ index 1b8683a..522a214 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,11 +1,11 @@
-From 3d715a4d3462ea6f15c6f3ebcb59f8e04afb2778 Mon Sep 17 00:00:00 2001
+From b430bd06929b4b872c2c1dfd006f01d2eabb1c68 Mon Sep 17 00:00:00 2001
 From: Dmck2b <itallhappenedverysuddenly@gmail.com>
 Date: Fri, 28 Nov 2014 01:53:14 -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 6788047..df976aa 100644
+index bebf181..66e85cb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -216,6 +216,7 @@ public abstract class World implements IBlockAccess {
@@ -33,5 +33,5 @@ index 522a214..00303dc 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0020-Drop-falling-block-entities-that-are-above-the-speci.patch

@@ -1,4 +1,4 @@
-From a9c5d65ab6b429e657fedbbc02054bd06e85b47c Mon Sep 17 00:00:00 2001
+From 523316f92cef57584b2bbb7eedc4ef05eafa13db Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Fri, 28 Nov 2014 02:03:43 -0600
 Subject: [PATCH] Drop falling block entities that are above the specified
@@ -47,5 +47,5 @@ index 00303dc..5306e9a 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,4 +1,4 @@
-From 3f75698f2fa54576ea3fcc419632a11a8d561722 Mon Sep 17 00:00:00 2001
+From 8d89115daeb46ccbbdbf237fc1f05cb511871503 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Fri, 28 Nov 2014 02:31:02 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
@@ -59,5 +59,5 @@ index 5306e9a..670f78f 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0022-Center-TNT-grid-sample-points.patch

@@ -1,11 +1,11 @@
-From 3dce94c4cc44d3d8e45152041758d32f1af49dce Mon Sep 17 00:00:00 2001
+From 4b0c6d3e028d76d272577216484f7db0217e4a3d Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 28 Nov 2014 02:36:18 -0600
 Subject: [PATCH] Center TNT grid sample points
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 08ea596..3cc9c2e 100644
+index 66e85cb..186d25d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1862,6 +1862,12 @@ public abstract class World implements IBlockAccess {
@@ -31,5 +31,5 @@ index 08ea596..3cc9c2e 100644
                          }
  
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,4 +1,4 @@
-From ca3686e34247e9ddafb2a06c2cdc68ad0266d1e5 Mon Sep 17 00:00:00 2001
+From 0bf41c7610e071565fed7b0691a5a581a315ec93 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 28 Nov 2014 03:31:21 -0600
 Subject: [PATCH] Player affects spawning API
@@ -30,7 +30,7 @@ index 71d4249..438ec3b 100644
              if (entityhuman != null) {
                  double d0 = entityhuman.locX - this.locX;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index da3f249..cc4d38c 100644
+index 67273f7..3571ead 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -52,7 +52,8 @@ public abstract class MobSpawnerAbstract {
@@ -146,10 +146,10 @@ index 186d25d..fa68938 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 fd00596..0b329be 100644
+index c81d5d2..942a6ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1474,6 +1474,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1443,6 +1443,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -167,5 +167,5 @@ index fd00596..0b329be 100644
  
      public Player.Spigot spigot()
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0024-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch

@@ -1,4 +1,4 @@
-From 4466adf61a6bf167e76311adcd48de923c863512 Mon Sep 17 00:00:00 2001
+From 4c3bc969af53090ac4f77e01f7d0014d58bf2454 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 19 Aug 2014 14:21:37 -0500
 Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and
@@ -19,5 +19,5 @@ index 5736d88..86b8cb2 100644
  
      public CrashReport b(CrashReport crashreport) {
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0025-RIP-metrics.patch

@@ -1,4 +1,4 @@
-From f4d23e0f111c8fddf84fe42a5d350f23f804f812 Mon Sep 17 00:00:00 2001
+From 85b3842e9754ceaa58a946949b402c31d6a07ff7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 19 Aug 2014 14:25:40 -0500
 Subject: [PATCH] RIP metrics

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

@@ -1,4 +1,4 @@
-From d2db00a5dafa29088df02116fb313e49838e0d59 Mon Sep 17 00:00:00 2001
+From 6904cc9f13c765652bec13688c575815fc914f78 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Fri, 28 Nov 2014 03:43:14 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
@@ -37,5 +37,5 @@ index 670f78f..0642f12 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,4 +1,4 @@
-From ec638c94f59ab071684d66c4f66c3c5a8c75d7c8 Mon Sep 17 00:00:00 2001
+From f3f9681b466aa0d0682a67e293c06ba928ffad9f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Nov 2014 04:14:14 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
@@ -22,7 +22,7 @@ index 7cf38ea..76cdc7e 100644
          this.position = BlockPosition.ZERO;
          this.h = -1;
 diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
-index 66b023c..65561c6 100644
+index 6bfde41..35d82ab 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
 @@ -48,7 +48,7 @@ public class TileEntityBeacon extends TileEntityContainer implements IUpdatePlay
@@ -74,7 +74,7 @@ index 7b6f8ae..c6b593f 100644
              if (this.e instanceof BlockDaylightDetector) {
                  ((BlockDaylightDetector) this.e).d(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 91c0a2f..13a6169 100644
+index fa68938..7507580 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -3,13 +3,7 @@ package net.minecraft.server;
@@ -284,5 +284,5 @@ index 0000000..1a53e94
 +}
 \ No newline at end of file
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0028-Move-sound-handling-out-of-the-chest-tick-loop.patch

@@ -1,4 +1,4 @@
-From 1c2ed16fe8abd746179ac58e9bc1a1b545e9dddf Mon Sep 17 00:00:00 2001
+From 329cf8e6cb3aed1ba4b212e5a368d3642615e4c7 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Fri, 28 Nov 2014 11:56:55 -0600
 Subject: [PATCH] Move sound handling out of the chest tick loop
@@ -198,5 +198,5 @@ index 218b801..15600ca 100644
      }
  
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0029-Remove-specific-entities-that-fly-through-an-unloade.patch

@@ -1,14 +1,14 @@
-From f3b16fad766f8f47c035ce0d294f3d7626f470e9 Mon Sep 17 00:00:00 2001
+From 1b38ac93e5234cf9ec8ab18f0706d5be2f0f89e6 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Fri, 28 Nov 2014 12:11:03 -0600
 Subject: [PATCH] Remove specific entities that fly through an unloaded chunk
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2e6e9c4..26a1f5d 100644
+index dfb4299..4848e09 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -119,6 +119,7 @@ public abstract class Entity implements ICommandListener {
+@@ -112,6 +112,7 @@ public abstract class Entity implements ICommandListener {
      private final CommandObjectiveExecutor as;
      public boolean valid; // CraftBukkit
      public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
@@ -116,5 +116,5 @@ index 0642f12..9507ab5 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0030-Configurable-strength-and-weakness-effect-modifiers.patch

@@ -1,4 +1,4 @@
-From a9bcbb534f1d780a4f7878fe12d192f16c722348 Mon Sep 17 00:00:00 2001
+From 6929e63583a63e15680ce543596b0271b74e1635 Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Fri, 28 Nov 2014 12:23:02 -0600
 Subject: [PATCH] Configurable strength and weakness effect modifiers
@@ -35,5 +35,5 @@ index 25a94a6..a7b18e4 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0031-Temporary-fix-for-rails-dupe.patch

@@ -1,4 +1,4 @@
-From a18ea39b2bb1e238ab951f1b30209bd2d40d8de0 Mon Sep 17 00:00:00 2001
+From e20a0fb77d352bd22f55070452b35d5731e2d64d Mon Sep 17 00:00:00 2001
 From: Dmck2b <suddenly@suddenly.coffee>
 Date: Fri, 28 Nov 2014 12:30:47 -0600
 Subject: [PATCH] Temporary fix for rails dupe
@@ -24,5 +24,5 @@ index 063177d..f1e299f 100644
                  this.b(world, blockposition, iblockdata, block);
              }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,4 +1,4 @@
-From 051e4b770eae14422c24b96f99d83bc033831d6e Mon Sep 17 00:00:00 2001
+From 4959d644d2d14fb12d4c574b24a6b1492d280450 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Nov 2014 12:48:26 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -150,10 +150,10 @@ index 86b8cb2..3592150 100644
                      lastTick = curTime;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7d7bba4..5f6f1cf 100644
+index d67d3d4..885c51a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1688,6 +1688,17 @@ public final class CraftServer implements Server {
+@@ -1690,6 +1690,17 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -212,5 +212,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 );
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,14 +1,14 @@
-From c8203a2b2a6a8e956c40407471543dadbe698393 Mon Sep 17 00:00:00 2001
+From ed8b2184c38475b4f496c6c6db4bfd636b87b8e6 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 0b329be..1a41f87 100644
+index 942a6ab..0c9f241 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1177,12 +1177,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1146,12 +1146,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
@@ -24,5 +24,5 @@ index 0b329be..1a41f87 100644
  
      @Override
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0034-Player-lookup-improvements.patch

@@ -1,4 +1,4 @@
-From 5b2eb900e278b76b5d0af2090c94b38268d53d6d Mon Sep 17 00:00:00 2001
+From 52caa9f8039d91a671e1cba1bf2ccf4ab487ed0d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Nov 2014 13:43:11 -0600
 Subject: [PATCH] Player lookup improvements
@@ -114,10 +114,10 @@ index 8be0698..4a908c6 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5f6f1cf..f10f41a 100644
+index 885c51a..cf3b140 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -400,7 +400,12 @@ public final class CraftServer implements Server {
+@@ -401,7 +401,12 @@ public final class CraftServer implements Server {
      public Player getPlayer(final String name) {
          Validate.notNull(name, "Name cannot be null");
  
@@ -131,7 +131,7 @@ index 5f6f1cf..f10f41a 100644
          String lowerName = name.toLowerCase();
          int delta = Integer.MAX_VALUE;
          for (Player player : getOnlinePlayers()) {
-@@ -421,15 +426,10 @@ public final class CraftServer implements Server {
+@@ -422,15 +427,10 @@ public final class CraftServer implements Server {
      public Player getPlayerExact(String name) {
          Validate.notNull(name, "Name cannot be null");
  
@@ -152,7 +152,7 @@ index 5f6f1cf..f10f41a 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7358519..e9bb266 100644
+index 0c9f241..e7c61fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -104,13 +104,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -171,5 +171,5 @@ index 7358519..e9bb266 100644
  
      public InetSocketAddress getAddress() {
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0035-Configurable-game-mechanics-changes.patch

@@ -1,4 +1,4 @@
-From 2647dbcf916a6057974c1d1c9829e4e9ef92c988 Mon Sep 17 00:00:00 2001
+From 3d4f74eca88c363209d02f64020a781597420236 Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Fri, 28 Nov 2014 13:53:48 -0600
 Subject: [PATCH] Configurable game mechanics changes
@@ -78,5 +78,5 @@ index 9507ab5..7f02e29 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,11 +1,11 @@
-From 80e5f75d95d552867bd9a5622b5cab4d47e30614 Mon Sep 17 00:00:00 2001
+From 54ddb82a4005cb701c1fc141b212afd14f597bde 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 c6ef0fd..2a42eff 100644
+index e06d2cd..db7eed4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -120,6 +120,24 @@ public class CraftWorld implements World {
@@ -34,5 +34,5 @@ index c6ef0fd..2a42eff 100644
          return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk;
      }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0037-Configurable-TNT-water-movement.patch

@@ -1,4 +1,4 @@
-From 62c665061563f8debb863ef56b76d0d9c0ed9cca Mon Sep 17 00:00:00 2001
+From b7ae0052d97f71cd39b386d8039a74a14c272306 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 29 Nov 2014 23:05:52 -0800
 Subject: [PATCH] Configurable TNT water movement
@@ -37,5 +37,5 @@ index 7f02e29..74d1017 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0038-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch

@@ -1,4 +1,4 @@
-From 87c9534ecac33e20a0e530adfa9e3c97b019e8f4 Mon Sep 17 00:00:00 2001
+From 581c061807816b5f6b20072cac4443d70b381dfa 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
@@ -64,5 +64,5 @@ index a7b18e4..01cd24a 100644
 +    }
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0039-Add-TNT-source-location-API.patch

@@ -1,4 +1,4 @@
-From f002f9d519a789e0077fecf5d1d2aedc87d48d7a Mon Sep 17 00:00:00 2001
+From cecc2d146aafd4f69e0d390f094655acfe974e6a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 30 Nov 2014 22:57:18 -0600
 Subject: [PATCH] Add TNT source location API
@@ -128,5 +128,5 @@ index e08ad47..b7e8b4d 100644
 +    // PaperSpigot end
  }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0040-Add-a-constructor-for-setting-header-and-footer.patch

@@ -1,4 +1,4 @@
-From 2b1b2245d21bb6791cd6c8371bc4d5849c9a5fdb Mon Sep 17 00:00:00 2001
+From 3f217e4361be07e0c8e4766310f6304c21f66c4c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 5 Dec 2014 22:44:50 -0600
 Subject: [PATCH] Add a constructor for setting header and footer
@@ -23,5 +23,5 @@ index 985e437..8acd298 100644
          packetlistenerplayout.a(this);
      }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

Spigot-Server-Patches/0041-Remove-CraftBukkit-Feature-of-ItemStack-s-having-inf.patch

@@ -1,4 +1,4 @@
-From c9c19a32491103333048f85b01b5ba51292b97b9 Mon Sep 17 00:00:00 2001
+From 7fb18d989c5d335b8686f0ef4ba9f519a4ed0234 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Dec 2014 16:28:22 -0600
 Subject: [PATCH] Remove CraftBukkit "Feature" of ItemStack's having infinite
@@ -150,5 +150,5 @@ index 040a69f..3269d39 100644
              itemstack.count = this.getMaxStackSize();
          }
 -- 
-1.9.1
+1.9.5.msysgit.0
 

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

@@ -1,4 +1,4 @@
-From 96e887420c3cb34ed76db944b598de11af1d4f7b Mon Sep 17 00:00:00 2001
+From 97ce812e9c70d3c91d638741c498a98d95d9f0ac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 3 Jul 2013 08:29:26 -0400
 Subject: [PATCH] Prevent tile entity and entity crashes
@@ -24,7 +24,7 @@ index 76cdc7e..d976515 100644
              crashreportsystemdetails.a("Actual block data value", (Callable) (new CrashReportTileEntityData(this)));
          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7f1adda..1763c70 100644
+index 72b9a2a..b89e3f2 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 {