Rebuild our patches for upstream changes

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

@@ -1,11 +1,11 @@
-From 26e2ea6f7f563be44fdc37919251dae52d6142c5 Mon Sep 17 00:00:00 2001
+From 0ff7d12c683b2c551d370785246277f7d94f330b 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 b0a90d7..1e5f057 100644
+index bae8ec9..7f65a76 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 {
@@ -22,7 +22,7 @@ index b0a90d7..1e5f057 100644
  
      private static final AxisAlignedBB a = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
      private static int entityCount;
-@@ -1949,7 +1956,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1947,7 +1954,7 @@ public abstract class Entity implements ICommandListener {
              // minecraftserver.getPlayerList().changeWorld(this, j, worldserver, worldserver1);
              boolean before = worldserver1.chunkProviderServer.forceChunkLoad;
              worldserver1.chunkProviderServer.forceChunkLoad = true;
@@ -31,7 +31,7 @@ index b0a90d7..1e5f057 100644
              worldserver1.chunkProviderServer.forceChunkLoad = before;
              // CraftBukkit end
              this.world.methodProfiler.c("reloading");
-@@ -1957,6 +1964,10 @@ public abstract class Entity implements ICommandListener {
+@@ -1955,6 +1962,10 @@ public abstract class Entity implements ICommandListener {
  
              if (entity != null) {
                  entity.n(this);
@@ -43,7 +43,7 @@ index b0a90d7..1e5f057 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 d1f69dc..8a2d6e0 100644
+index 8700b18..c5d8c56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -451,7 +451,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,4 +1,4 @@
-From e2925f8aaa6f2597fdea35baa1a7c2de9db2598c Mon Sep 17 00:00:00 2001
+From aec3947eeba33c80f737bd1a0beaae15b017b7a9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <Zbob750@live.com>
 Date: Fri, 28 Nov 2014 00:35:56 -0600
 Subject: [PATCH] Vanished players don't have rights
@@ -43,10 +43,10 @@ index ce3e628..005e995 100644
              if (movingobjectposition.type == EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.aq();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7a41398..1b895e3 100644
+index 9cf1463..7b58d0c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1654,6 +1654,14 @@ public abstract class World implements IBlockAccess {
+@@ -1656,6 +1656,14 @@ public abstract class World implements IBlockAccess {
          for (int i = 0; i < list.size(); ++i) {
              Entity entity1 = (Entity) list.get(i);
  

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

@@ -1,14 +1,14 @@
-From 5a51e51a849a44eeb57a149ca5aa2c8bdd59c3cb Mon Sep 17 00:00:00 2001
+From 3dce94c4cc44d3d8e45152041758d32f1af49dce 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 4540baa..4af7973 100644
+index 08ea596..3cc9c2e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1860,6 +1860,12 @@ public abstract class World implements IBlockAccess {
+@@ -1862,6 +1862,12 @@ public abstract class World implements IBlockAccess {
          double d1 = 1.0D / ((axisalignedbb.e - axisalignedbb.b) * 2.0D + 1.0D);
          double d2 = 1.0D / ((axisalignedbb.f - axisalignedbb.c) * 2.0D + 1.0D);
  
@@ -21,7 +21,7 @@ index 4540baa..4af7973 100644
          if (d0 >= 0.0D && d1 >= 0.0D && d2 >= 0.0D) {
              int i = 0;
              int j = 0;
-@@ -1871,7 +1877,7 @@ public abstract class World implements IBlockAccess {
+@@ -1873,7 +1879,7 @@ public abstract class World implements IBlockAccess {
                          double d4 = axisalignedbb.b + (axisalignedbb.e - axisalignedbb.b) * (double) f1;
                          double d5 = axisalignedbb.c + (axisalignedbb.f - axisalignedbb.c) * (double) f2;
  

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

@@ -1,11 +1,11 @@
-From e79588a56cc3c99a0df366a06a2c351568650383 Mon Sep 17 00:00:00 2001
+From dde4bca2bceb41f4039c7bc1f1ab2c433a23b07f 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 32199f1..b760015 100644
+index acc83d0..998c13a 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -61,6 +61,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -67,7 +67,7 @@ index 43954b3..932a572 100644
                                                          biomemeta = worldserver.a(enumcreaturetype, blockposition2);
                                                          if (biomemeta == null) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 095f81f..c57f2b7 100644
+index 3cc9c2e..031a906 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,14 +2,13 @@ package net.minecraft.server;
@@ -94,7 +94,7 @@ index 095f81f..c57f2b7 100644
  import org.bukkit.craftbukkit.SpigotTimings; // Spigot
  import org.bukkit.generator.ChunkGenerator;
  import org.bukkit.craftbukkit.CraftServer;
-@@ -2773,6 +2771,50 @@ public abstract class World implements IBlockAccess {
+@@ -2775,6 +2773,50 @@ public abstract class World implements IBlockAccess {
          return false;
      }
  
@@ -146,7 +146,7 @@ index 095f81f..c57f2b7 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 76de4a4..393b762 100644
+index c5d8c56..f73b6d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,11 +1,11 @@
-From 98ec341d07427cb8f14ffcd7c7781f8d274c1fca Mon Sep 17 00:00:00 2001
+From be0607cda9319cb9adb809dfd4c7629990682011 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 1e5f057..bf9dfbf 100644
+index 7f65a76..4466b47 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 {
@@ -70,10 +70,10 @@ index 4823698..7b856ef 100644
          this.motY *= 0.9800000190734863D;
          this.motZ *= 0.9800000190734863D;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 351c88b..4e8a3ca 100644
+index 3f84c8f..7f1adda 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1151,6 +1151,7 @@ public abstract class World implements IBlockAccess {
+@@ -1153,6 +1153,7 @@ public abstract class World implements IBlockAccess {
              {
                  if ( !this.isChunkLoaded( chunkx, chunkz, true ) )
                  {
@@ -81,7 +81,7 @@ index 351c88b..4e8a3ca 100644
                      continue;
                  }
                  int cz = chunkz << 4;
-@@ -1568,6 +1569,14 @@ public abstract class World implements IBlockAccess {
+@@ -1570,6 +1571,14 @@ public abstract class World implements IBlockAccess {
          if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
              entity.ticksLived++;
              entity.inactiveTick();

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

@@ -1,4 +1,4 @@
-From 3b0c7587dfe87b5fe35cb0208b8c12f590b1cee4 Mon Sep 17 00:00:00 2001
+From a63a30097cb93decbd8735d557a4d32ece9c2451 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
@@ -13,7 +13,7 @@ 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 d2f2547..d1daf3c 100644
+index 9664482..a92a369 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -48,6 +48,31 @@ public abstract class PlayerList {
@@ -82,7 +82,7 @@ index d2f2547..d1daf3c 100644
              savePlayerFile(entityplayer); // CraftBukkit - Force the player's inventory to be saved
              entityplayer.playerConnection.disconnect("You logged in from another location");
          }
-@@ -948,6 +979,7 @@ public abstract class PlayerList {
+@@ -957,6 +988,7 @@ public abstract class PlayerList {
      }
  
      public EntityPlayer getPlayer(String s) {
@@ -152,7 +152,7 @@ index 590fe28..54e595d 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 b8a37b6..e495eb7 100644
+index f07a3a8..b1646e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -103,13 +103,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {