From 3d490255dc5e53a0e6ae1f957cd17d58da979666 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 1 Sep 2015 20:14:41 -0500
Subject: [PATCH] Rebuild patches

---
 .../Configurable-top-of-nether-void-damage.patch     |  4 +---
 .../Disable-explosion-knockback.patch                |  4 +---
 ...d-chunks-for-specific-entities-that-fly-thr.patch | 12 +++++++-----
 ...rtain-entities-that-fly-through-unloaded-ch.patch |  6 ++----
 .../Teleport-passenger-vehicle-with-player.patch     |  4 +---
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
index 29aa776308..95de84dc89 100644
--- a/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
@@ -46,6 +46,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
 +    }
  }
--- 
-1.9.5.msysgit.1
-
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Disable-explosion-knockback.patch b/Spigot-Server-Patches/Disable-explosion-knockback.patch
index 3bb51c5176..08b52f878a 100644
--- a/Spigot-Server-Patches/Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/Disable-explosion-knockback.patch
@@ -66,6 +66,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        disableExplosionKnockback = getBoolean( "disable-explosion-knockback", false );
 +    }
  }
--- 
-1.9.5.msysgit.1
-
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch b/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
index dc9ab03a9d..9c683d90ca 100644
--- a/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
+++ b/Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
@@ -31,8 +31,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
-     public boolean valid; // CraftBukkit
      public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
+     public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
      public boolean inUnloadedChunk = false; // PaperSpigot - Remove entities in unloaded chunks
 +    public boolean loadChunks = false; // PaperSpigot - Entities can load chunks they move through and keep them loaded
  
@@ -52,6 +52,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            }
 +        }
 +    }
++
 +
      public void move(double d0, double d1, double d2) {
          org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.startTiming(); // Spigot
@@ -114,6 +115,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          // CraftBukkit start
          // float f = 4.0F;
 -        
++
 +        // PaperSpigot start - Force load chunks during TNT explosions
 +        ChunkProviderServer chunkProviderServer = ((ChunkProviderServer) world.chunkProvider);
 +        boolean forceChunkLoad = chunkProviderServer.forceChunkLoad;
@@ -121,6 +123,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            chunkProviderServer.forceChunkLoad = true;
 +        }
 +        // PaperSpigot end
++
          org.bukkit.craftbukkit.CraftServer server = this.world.getServer();
  
          ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, this));
@@ -128,6 +131,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.world.createExplosion(this, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, event.getRadius(), event.getFire(), true);
          }
          // CraftBukkit end
++
 +        // PaperSpigot start - Force load chunks during TNT explosions
 +        if (world.paperSpigotConfig.loadUnloadedTNTEntities) {
 +            chunkProviderServer.forceChunkLoad = forceChunkLoad;
@@ -193,10 +197,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          SpigotTimings.checkIfActiveTimer.startTiming();
          // Never safe to skip fireworks or entities not yet added to chunk
 -        if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks ) {
-+        if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks || entity.loadChunks ) {
++        if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks || entity.loadChunks ) { // PaperSpigot
              SpigotTimings.checkIfActiveTimer.stopTiming();
              return true;
          }
--- 
-1.9.5.msysgit.1
-
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch b/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
index 8c3f5aa23a..1d9fc33e6e 100644
--- a/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
+++ b/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
@@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
-     private final CommandObjectiveExecutor au;
      public boolean valid; // CraftBukkit
      public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
+     public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
 +    public boolean inUnloadedChunk = false; // PaperSpigot - Remove entities in unloaded chunks
  
      // Spigot start
@@ -115,6 +115,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        removeUnloadedFallingBlocks = getBoolean( "remove-unloaded.falling-blocks", true );
 +    }
  }
--- 
-1.9.5.msysgit.1
-
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
index 65415251fe..7acce93ac1 100644
--- a/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
+++ b/Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
@@ -96,6 +96,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return true;
      }
  
--- 
-1.9.5.msysgit.1
-
+--
\ No newline at end of file