Skip Entity and Tile Entity ticking in chunks scheduled for unload (#1132)

Fixes #1131
2024-11-23 11:06:29 +01:00 · 2018-05-30 23:31:55 +03:00 · 2018-05-30 23:31:55 +03:00 · e74e4584d6
commit e74e4584d6
parent 51b88cabbc
26 changed files with 168 additions and 129 deletions
--- a/Spigot-API-Patches/0008-Check-Paper-versions.patch
+++ b/Spigot-API-Patches/0008-Check-Paper-versions.patch
@ -1,4 +1,4 @@
-From f62031b4b496b560ba5e5229eba8202def54c924 Mon Sep 17 00:00:00 2001
+From 5a25f66a6e73b622258aeee69d25128aed24693a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:58:01 -0600
 Subject: [PATCH] Check Paper versions
@ -148,5 +148,5 @@ index 760d58eb..044361af 100644
 +    // Paper end
 }
 -- 
-2.17.0.windows.1
+2.17.0

--- a/Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch
@ -1,4 +1,4 @@
-From 2256c77fd4bb1f31314fe41b9fd91504517b70d4 Mon Sep 17 00:00:00 2001
+From fcbd68f84a9637e4bb730429bd02ea4c4387c655 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@ -11,7 +11,7 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
 The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 38ccabc0d..b241c0380 100644
+index 38ccabc0..b241c038 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -237,4 +237,9 @@ public class PaperWorldConfig {
@ -25,7 +25,7 @@ index 38ccabc0d..b241c0380 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c14100ac6..6a43f5674 100644
+index c14100ac..6a43f567 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -614,7 +614,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -39,5 +39,5 @@ index c14100ac6..6a43f5674 100644
         return true;
     }
 -- 
-2.14.3
+2.17.0

--- a/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@ -1,4 +1,4 @@
-From d83312daee696d0883b12842fc5b72cf4fd11508 Mon Sep 17 00:00:00 2001
+From 9b474a298c2d17cf09c33059a5265c14b75b1a0e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ce43e7bb7..112c447e2 100644
+index ce43e7bb..5367fead 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -344,4 +344,13 @@ public class PaperWorldConfig {
+@@ -344,4 +344,18 @@ public class PaperWorldConfig {
     private void isHopperPushBased() {
         isHopperPushBased = getBoolean("hopper.push-based", false);
     }
@ -32,10 +32,15 @@ index ce43e7bb7..112c447e2 100644
 +            log("Delaying chunk unloads by " + delayChunkUnloadsBy + " seconds");
 +            delayChunkUnloadsBy *= 1000;
 +        }
+    }
+
+    public boolean skipEntityTickingInChunksScheduledForUnload = true;
+    private void skipEntityTickingInChunksScheduledForUnload() {
+        skipEntityTickingInChunksScheduledForUnload = getBoolean("settings.skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a847aa079..8ec26b97c 100644
+index a847aa07..8ec26b97 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -30,6 +30,7 @@ public class Chunk {
@ -47,7 +52,7 @@ index a847aa079..8ec26b97c 100644
     public final int locZ;
     private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c7af8da61..0adfcaa8b 100644
+index 5cc192bb..47159bff 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -315,6 +315,19 @@ public class ChunkProviderServer implements IChunkProvider {
@ -71,7 +76,7 @@ index c7af8da61..0adfcaa8b 100644
             this.chunkLoader.b();
         }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 3d30e1831..48a008e0a 100644
+index 3d30e183..48a008e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -32,8 +32,16 @@ public class PlayerChunk {
@ -108,7 +113,7 @@ index 3d30e1831..48a008e0a 100644
             // CraftBukkit end
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ad1d90b56..0b10f1684 100644
+index ad1d90b5..0b10f168 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -487,7 +487,13 @@ public class PlayerChunkMap {
@ -126,8 +131,27 @@ index ad1d90b56..0b10f1684 100644
         }
 
     }
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index bce3fca8..fccfd3dd 100644
+--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
+@@ -1594,7 +1594,13 @@ public abstract class World implements IBlockAccess {
+             if (!tileentity.y() && tileentity.u()) {
+                 BlockPosition blockposition = tileentity.getPosition();
+ 
+-                if (this.isLoaded(blockposition) && this.P.a(blockposition)) {
+                // Paper start - Skip ticking in chunks scheduled for unload
+                net.minecraft.server.Chunk chunk = this.getChunkIfLoaded(blockposition);
+                boolean shouldTick = chunk != null;
+                if(this.paperConfig.skipEntityTickingInChunksScheduledForUnload)
+                    shouldTick = shouldTick && !chunk.isUnloading() && chunk.scheduledForUnload == null;
+                if (shouldTick && this.P.a(blockposition)) {
+                    // Paper end
+                     try {
+                         this.methodProfiler.a(() -> {
+                             return String.valueOf(TileEntity.a(tileentity.getClass()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 69dc11e2b..284dc6391 100644
+index 69dc11e2..284dc639 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1576,7 +1576,7 @@ public class CraftWorld implements World {
@ -139,6 +163,21 @@ index 69dc11e2b..284dc6391 100644
                 continue;
             }
 
+diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
+index 47865c02..b79bf70f 100644
+--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
+@@ -283,6 +283,10 @@ public class ActivationRange
+         {
+             isActive = false;
+         }
+        // Paper start - Skip ticking in chunks scheduled for unload
+        if(entity.world.paperConfig.skipEntityTickingInChunksScheduledForUnload && (chunk == null || chunk.isUnloading() || chunk.scheduledForUnload != null))
+            isActive = false;
+        // Paper end
+         return isActive;
+     }
+ }
 -- 
-2.16.1
+2.17.0

--- a/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch
@ -1,4 +1,4 @@
-From 4d3b8719bc006e01e01ac058f2fe9215d8d196ee Mon Sep 17 00:00:00 2001
+From 358cce0396af34c1ddee7fa64cdf6467549d49fd Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@ -7,12 +7,12 @@ Instead of calculating the damage taken from hitting a wall, you can
 disable it in the config.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 112c447e2..d182e716a 100644
+index 5367fead..3aa6f89e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -353,4 +353,9 @@ public class PaperWorldConfig {
-             delayChunkUnloadsBy *= 1000;
-         }
+@@ -358,4 +358,9 @@ public class PaperWorldConfig {
+     private void skipEntityTickingInChunksScheduledForUnload() {
+         skipEntityTickingInChunksScheduledForUnload = getBoolean("settings.skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
     }
 +
 +    public boolean elytraHitWallDamage = true;
@ -21,7 +21,7 @@ index 112c447e2..d182e716a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4b6bb38ae..dda6219a7 100644
+index 4b6bb38a..dda6219a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1739,6 +1739,7 @@ public abstract class EntityLiving extends Entity {
@ -41,5 +41,5 @@ index 4b6bb38ae..dda6219a7 100644
                 if (this.onGround && !this.world.isClientSide) {
                     if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.16.2
+2.17.0

--- a/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch
@ -1,4 +1,4 @@
-From 4d5243e343835ff1f71ea9e9f41cc4985fb13749 Mon Sep 17 00:00:00 2001
+From ecdf46882f7290071b36fa9e8c37a85155955cd8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 621c585e7..459c86bce 100644
+index 621c585e..459c86bc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -251,4 +251,15 @@ public class PaperConfig {
@ -32,7 +32,7 @@ index 621c585e7..459c86bce 100644
 +    }
 }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d182e716a..d1655de42 100644
+index 3aa6f89e..f3c0bbde 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@ -43,7 +43,7 @@ index d182e716a..d1655de42 100644
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.spigotmc.SpigotWorldConfig;
 
-@@ -358,4 +359,19 @@ public class PaperWorldConfig {
+@@ -363,4 +364,19 @@ public class PaperWorldConfig {
     private void elytraHitWallDamage() {
         elytraHitWallDamage = getBoolean("elytra-hit-wall-damage", true);
     }
@ -64,7 +64,7 @@ index d182e716a..d1655de42 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8ec26b97c..87730aec3 100644
+index 8ec26b97..87730aec 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -963,11 +963,9 @@ public class Chunk {
@ -82,7 +82,7 @@ index 8ec26b97c..87730aec3 100644
 
     public Random a(long i) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 47159bff3..db81b4a8c 100644
+index 47159bff..db81b4a8 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -1,5 +1,6 @@
@ -102,7 +102,7 @@ index 47159bff3..db81b4a8c 100644
                 }
             }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2391adac7..8b7eb47a2 100644
+index 2391adac..8b7eb47a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -114,7 +114,7 @@ index 2391adac7..8b7eb47a2 100644
     public final MinecraftServer server;
     public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ab7933079..5c09c6ff7 100644
+index ab793307..5c09c6ff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -119,6 +119,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -161,7 +161,7 @@ index ab7933079..5c09c6ff7 100644
         this.methodProfiler.a("tallying");
         // Spigot start
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3fc242e4b..90f6e2e04 100644
+index 3fc242e4..90f6e2e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -343,6 +343,7 @@ public abstract class PlayerList {
@ -200,7 +200,7 @@ index 3fc242e4b..90f6e2e04 100644
     public void addWhitelist(GameProfile gameprofile) {
         this.whitelist.add(new WhiteListEntry(gameprofile));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ebe397116..53cea76e2 100644
+index ebe39711..53cea76e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1053,8 +1053,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -223,5 +223,5 @@ index ebe397116..53cea76e2 100644
             timings.worldSaveChunks.startTiming(); // Paper
             chunkproviderserver.a(flag);
 -- 
-2.14.3
+2.17.0

--- a/Spigot-Server-Patches/0154-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0154-Chunk-registration-fixes.patch
@ -1,4 +1,4 @@
-From da448ceff5f7a99b59b3b5ee87a49ff6d4a156e1 Mon Sep 17 00:00:00 2001
+From 2d53913c288c1fa5b130d89ebd836ff56060a699 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bafa37f64..d5e338eb3 100644
+index 3051a3e4..5cd7b22f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1764,7 +1764,7 @@ public abstract class World implements IBlockAccess {
+@@ -1770,7 +1770,7 @@ public abstract class World implements IBlockAccess {
         }
 
         i = MathHelper.floor(entity.locX / 16.0D);
--- a/Spigot-Server-Patches/0159-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0159-Option-to-remove-corrupt-tile-entities.patch
@ -1,14 +1,14 @@
-From 8f7f997a86b876a3311ca579a33d17e307962df5 Mon Sep 17 00:00:00 2001
+From 3fdbbb11811a42cff05d2e2af46c201b72063ba9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d1655de42..21ae11e0a 100644
+index f3c0bbde..f30e36f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -374,4 +374,9 @@ public class PaperWorldConfig {
+@@ -379,4 +379,9 @@ public class PaperWorldConfig {
     private void maxAutoSaveChunksPerTick() {
         maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
     }
@ -19,7 +19,7 @@ index d1655de42..21ae11e0a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 87730aec3..1d056031b 100644
+index 87730aec..1d056031 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -786,11 +786,17 @@ public class Chunk {
@ -41,5 +41,5 @@ index 87730aec3..1d056031b 100644
         if (this.j) {
             TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.16.1
+2.17.0

--- a/Spigot-Server-Patches/0162-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0162-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@ -1,4 +1,4 @@
-From cc91cfedfbbbd4410d42aac800deea920935c138 Mon Sep 17 00:00:00 2001
+From 86cd32f05d0ffe0aef1cf51619254522e6af51c8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@ -7,10 +7,10 @@ If the save queue already has 50 (configurable) of chunks pending,
 then avoid processing auto save (which would add more)

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 21ae11e0a..f84fc54ec 100644
+index f30e36f3..43c38f67 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -375,6 +375,11 @@ public class PaperWorldConfig {
+@@ -380,6 +380,11 @@ public class PaperWorldConfig {
         maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
     }
 
@ -23,7 +23,7 @@ index 21ae11e0a..f84fc54ec 100644
     private void removeCorruptTEs() {
         removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9e8f67ffd..2b87329f4 100644
+index db81b4a8..93e938a9 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -254,6 +254,14 @@ public class ChunkProviderServer implements IChunkProvider {
@ -51,7 +51,7 @@ index 9e8f67ffd..2b87329f4 100644
                 }
             }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 8747d9a45..77943821e 100644
+index 8747d9a4..77943821 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -39,6 +39,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -64,5 +64,5 @@ index 8747d9a45..77943821e 100644
     @Nullable
     public Chunk a(World world, int i, int j) throws IOException {
 -- 
-2.16.1
+2.17.0

--- a/Spigot-Server-Patches/0164-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0164-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@ -1,11 +1,11 @@
-From 24bd8aa011e4db23f1dff3e17a4925e30bc4b08a Mon Sep 17 00:00:00 2001
+From 216cb32c9cb104f0f5c4f089381afd5009154f53 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f84fc54ec..513c4b020 100644
+index 43c38f67..06911639 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@ -16,7 +16,7 @@ index f84fc54ec..513c4b020 100644
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.spigotmc.SpigotWorldConfig;
 
-@@ -384,4 +385,12 @@ public class PaperWorldConfig {
+@@ -389,4 +390,12 @@ public class PaperWorldConfig {
     private void removeCorruptTEs() {
         removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
     }
@ -30,7 +30,7 @@ index f84fc54ec..513c4b020 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 59acc9088..d0b67d8fd 100644
+index 59acc908..d0b67d8f 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -271,6 +271,14 @@ public class EntityFallingBlock extends Entity {
@ -49,7 +49,7 @@ index 59acc9088..d0b67d8fd 100644
         Block block = this.block.getBlock();
 
 diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
-index b24f7d8b2..5a08f6b4e 100644
+index b24f7d8b..5a08f6b4 100644
 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
@@ -102,7 +102,14 @@ public class ItemMonsterEgg extends Item {
@ -69,5 +69,5 @@ index b24f7d8b2..5a08f6b4e 100644
                 entity.f(nbttagcompound1);
             }
 -- 
-2.16.1
+2.17.0

--- a/Spigot-Server-Patches/0174-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0174-Vanished-players-don-t-have-rights.patch
@ -1,11 +1,11 @@
-From 61a4082b64104fb1bda5cfb0ba8e504719a1fa3c Mon Sep 17 00:00:00 2001
+From ea9430baff2cace9b95082903fe4dae68eb5a139 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f444465ca..36914ed94 100644
+index 4341a947..6dab8940 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@ -18,7 +18,7 @@ index f444465ca..36914ed94 100644
     protected int j;
     private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 60149c1ca..a5730d1c7 100644
+index 60149c1c..a5730d1c 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -20,7 +20,7 @@ public class ItemBlock extends Item {
@ -31,10 +31,10 @@ index 60149c1ca..a5730d1c7 100644
             IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ea6f46522..01dba285a 100644
+index 51ab06f9..5925fd96 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1799,6 +1799,33 @@ public abstract class World implements IBlockAccess {
+@@ -1805,6 +1805,33 @@ public abstract class World implements IBlockAccess {
         return this.a(axisalignedbb, (Entity) null);
     }
 
@ -68,7 +68,7 @@ index ea6f46522..01dba285a 100644
     public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
         List list = this.getEntities((Entity) null, axisalignedbb);
 
-@@ -2689,7 +2716,7 @@ public abstract class World implements IBlockAccess {
+@@ -2695,7 +2722,7 @@ public abstract class World implements IBlockAccess {
         AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().d(this, blockposition);
 
         // CraftBukkit start - store default return
@ -78,7 +78,7 @@ index ea6f46522..01dba285a 100644
         this.getServer().getPluginManager().callEvent(event);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 06a277b3b..5f816e44f 100644
+index 06a277b3..5f816e44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -810,6 +810,13 @@ public class CraftEventFactory {
--- a/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch
@ -1,4 +1,4 @@
-From d2e86c1abb81ba80804af0d666364169635112b7 Mon Sep 17 00:00:00 2001
+From 213b2bd7224e1b58693a49a2ba5fc21be5ebe9e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 513c4b020..631aa6eb9 100644
+index 06911639..50dc50a7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -393,4 +393,14 @@ public class PaperWorldConfig {
+@@ -398,4 +398,14 @@ public class PaperWorldConfig {
             Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
         }
     }
@ -28,7 +28,7 @@ index 513c4b020..631aa6eb9 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 9d201b14e..57fcc3c05 100644
+index 9d201b14..57fcc3c0 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -783,7 +783,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
--- a/Spigot-Server-Patches/0180-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0180-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@ -1,14 +1,14 @@
-From 1228b89be7bd30aab11b8e96307e2a799ffe0565 Mon Sep 17 00:00:00 2001
+From 81dfa8e18a2f12690a57200bb26ef7b4f11273fe Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 631aa6eb9..7871406e4 100644
+index 50dc50a7..f65a3fe8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -403,4 +403,9 @@ public class PaperWorldConfig {
+@@ -408,4 +408,9 @@ public class PaperWorldConfig {
             log("Treasure Maps will return already discovered locations");
         }
     }
@ -19,7 +19,7 @@ index 631aa6eb9..7871406e4 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 01dba285a..b0139fff6 100644
+index 5925fd96..07ecded6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1335,6 +1335,7 @@ public abstract class World implements IBlockAccess {
@ -31,5 +31,5 @@ index 01dba285a..b0139fff6 100644
 
             for (int i = 0; i < list.size(); ++i) {
 -- 
-2.16.1
+2.17.0

--- a/Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch
@ -1,11 +1,11 @@
-From c20ed8397e8fb41958afded100db816ca70b2f17 Mon Sep 17 00:00:00 2001
+From 0a3a33fea101ac2f6421f6e8907895db67cedb42 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 36914ed94..546059414 100644
+index 36914ed9..54605941 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1937,6 +1937,7 @@ public abstract class Entity implements ICommandListener {
@ -17,5 +17,5 @@ index 36914ed94..546059414 100644
             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
         } else {
 -- 
-2.16.2
+2.17.0

--- a/Spigot-Server-Patches/0196-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0196-Cap-Entity-Collisions.patch
@ -1,4 +1,4 @@
-From 30d0223b0455e9c911511ddb3a66304a98dc45e2 Mon Sep 17 00:00:00 2001
+From 658642250d0d7fadf44d95ff1f41a4d36b69eaa5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7871406e..3ba46530 100644
+index f65a3fe8..0ea2a856 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -408,4 +408,10 @@ public class PaperWorldConfig {
+@@ -413,4 +413,10 @@ public class PaperWorldConfig {
     private void armorStandEntityLookups() {
         armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
     }
@ -27,7 +27,7 @@ index 7871406e..3ba46530 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 54605941..a5ed651d 100644
+index 3f1c78af..04bc05d3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener {
@ -39,7 +39,7 @@ index 54605941..a5ed651d 100644
     // Spigot end
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 91e8c1d7..adb04593 100644
+index 38c04337..c97ee68a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2191,8 +2191,11 @@ public abstract class EntityLiving extends Entity {
@ -56,5 +56,5 @@ index 91e8c1d7..adb04593 100644
                 this.C(entity);
             }
 -- 
-2.14.3
+2.17.0

--- a/Spigot-Server-Patches/0205-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0205-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@ -1,4 +1,4 @@
-From ebbbd57bf2397064370febaf38071d5e5d21f868 Mon Sep 17 00:00:00 2001
+From 39278b7a6809d7dbbb8e57ade7deda8e72a1f7fe Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3ba46530..79b12a6e 100644
+index 0ea2a856..bf6b20f7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -414,4 +414,10 @@ public class PaperWorldConfig {
+@@ -419,4 +419,10 @@ public class PaperWorldConfig {
         maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
         log( "Max Entity Collisions: " + maxCollisionsPerEntity );
     }
@ -57,5 +57,5 @@ index 9abc9852..3104fc0e 100644
 
         case STOP_SNEAKING:
 -- 
-2.14.3
+2.17.0

--- a/Spigot-Server-Patches/0208-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0208-provide-a-configurable-option-to-disable-creeper-lin.patch
@ -1,4 +1,4 @@
-From a734bec584fc7eb12b44e35c5693392f9df1e57e Mon Sep 17 00:00:00 2001
+From 770db1961ea2c57c7898471c2e5fa5a1fb3e69e6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 79b12a6e..7802cc1f 100644
+index bf6b20f7..601eb08b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -420,4 +420,10 @@ public class PaperWorldConfig {
+@@ -425,4 +425,10 @@ public class PaperWorldConfig {
         parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
         log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
     }
@ -34,5 +34,5 @@ index c872607f..8098d4d9 100644
 
             entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.14.3
+2.17.0

--- a/Spigot-Server-Patches/0217-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0217-Entity-fromMobSpawner.patch
@ -1,4 +1,4 @@
-From f19c6cf608e13d6fe8e7e031b89651436b695518 Mon Sep 17 00:00:00 2001
+From 37254b265b7e918cef1d4e01b9f6fd6396623f07 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
@ -64,5 +64,5 @@ index 14df5ff0..1571e4eb 100644
     // Paper end
 }
 -- 
-2.14.3
+2.17.0

--- a/Spigot-Server-Patches/0233-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0233-Anti-Xray.patch
@ -1,11 +1,11 @@
-From 49185dd588fb43036579f3691ab48e3b13b2ae51 Mon Sep 17 00:00:00 2001
+From 24864d251b955cf8e6fcb91beb5d65dd535b2170 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Thu, 21 Sep 2017 00:38:47 +0200
 Subject: [PATCH] Anti-Xray


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7802cc1f..30307da0 100644
+index 601eb08b..fef49cf7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -1,7 +1,10 @@
@ -19,7 +19,7 @@ index 7802cc1f..30307da0 100644
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
-@@ -426,4 +429,27 @@ public class PaperWorldConfig {
+@@ -431,4 +434,27 @@ public class PaperWorldConfig {
         disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
         log("Creeper lingering effect: " + disableCreeperLingeringEffect);
     }
@ -1518,7 +1518,7 @@ index 8860a012..fa0d66d6 100644
         return this.a.size();
     }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 00513d02..592e5b3b 100644
+index 57bc9165..de1954a2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -35,6 +35,8 @@ import org.bukkit.generator.ChunkGenerator;
@ -1595,5 +1595,5 @@ index 9942f0c7..2da6edc6 100644
                         }
                     }
 -- 
-2.14.1.windows.1
+2.17.0

--- a/Spigot-Server-Patches/0244-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0244-Option-for-maximum-exp-value-when-merging-orbs.patch
@ -1,14 +1,14 @@
-From 06b4ff65646915cf98aa1c2370c2182a617ca5da Mon Sep 17 00:00:00 2001
+From e8c4bfe810e61f6c62e6e36cbd3920e46b11b998 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 30307da0..a3119cd1 100644
+index fef49cf7..57cf49a7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -452,4 +452,10 @@ public class PaperWorldConfig {
+@@ -457,4 +457,10 @@ public class PaperWorldConfig {
         replacementBlocks = getList("anti-xray.replacement-blocks", Arrays.asList((Object) "stone", "planks"));
         log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks / Update Radius: " + updateRadius);
     }
@ -20,7 +20,7 @@ index 30307da0..a3119cd1 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a4bdaa71..362f0545 100644
+index 8a249af0..b193e051 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1143,16 +1143,30 @@ public abstract class World implements IBlockAccess {
@ -56,5 +56,5 @@ index a4bdaa71..362f0545 100644
         } // Spigot end
 
 -- 
-2.14.1.windows.1
+2.17.0

--- a/Spigot-Server-Patches/0256-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0256-Configurable-Chunks-Sends-per-Tick-setting.patch
@ -1,4 +1,4 @@
-From 8b7f2e2df1b19036d1b117a9771e2cfbfe7a51ba Mon Sep 17 00:00:00 2001
+From b6556677e0c93e803b8d3930269363208bb0d035 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
@ -8,10 +8,10 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a3119cd1..259f5c70 100644
+index 57cf49a7..d5babe47 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -458,4 +458,13 @@ public class PaperWorldConfig {
+@@ -463,4 +463,13 @@ public class PaperWorldConfig {
         expMergeMaxValue = getInt("experience-merge-max-value", -1);
         log("Experience Merge Max Value: " + expMergeMaxValue);
     }
@ -39,5 +39,5 @@ index 4af55732..6ee9f6cf 100644
             Iterator iterator2 = this.g.iterator();
 
 -- 
-2.14.1.windows.1
+2.17.0

--- a/Spigot-Server-Patches/0257-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0257-Configurable-Max-Chunk-Gens-per-Tick.patch
@ -1,4 +1,4 @@
-From a154447f379d5f53108dfa6696d27dce53c51cc5 Mon Sep 17 00:00:00 2001
+From f5702893dccc7fa893135bf36c108bbc66fa8219 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@ -13,10 +13,10 @@ This should result in no noticeable speed reduction in generation for servers no
 lagging, and let larger servers reduce this value according to their own desires.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 259f5c70..3df3b433 100644
+index d5babe47..99bc456e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -467,4 +467,16 @@ public class PaperWorldConfig {
+@@ -472,4 +472,16 @@ public class PaperWorldConfig {
         }
         log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
     }
@ -34,7 +34,7 @@ index 259f5c70..3df3b433 100644
 +
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 045adbd3..20e734bc 100644
+index 395386f2..baf72404 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -27,6 +27,7 @@ public class PlayerChunk {
@ -108,5 +108,5 @@ index 193c3621..cf1258c5 100644
 +    // Paper end
 }
 -- 
-2.14.1.windows.1
+2.17.0

--- a/Spigot-Server-Patches/0258-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0258-Make-max-squid-spawn-height-configurable.patch
@ -1,4 +1,4 @@
-From 14722028d518e9638b12c068990a7f12e6e76971 Mon Sep 17 00:00:00 2001
+From 036e5362efcfdde64d6a0bb3ce0e359573c9358c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@ -7,10 +7,10 @@ I don't know why upstream made only the minimum height configurable but
 whatever

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3df3b433..be4431c1 100644
+index 99bc456e..f6a8fcae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -479,4 +479,9 @@ public class PaperWorldConfig {
+@@ -484,4 +484,9 @@ public class PaperWorldConfig {
         }
     }
 
@ -36,5 +36,5 @@ index 0ce16be6..58a90283 100644
 
     public void b(float f, float f1, float f2) {
 -- 
-2.14.1.windows.1
+2.17.0

--- a/Spigot-Server-Patches/0267-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0267-Optimize-Hoppers.patch
@ -1,4 +1,4 @@
-From ea2034c960ba8910596f61623ecfbea23568e907 Mon Sep 17 00:00:00 2001
+From 50648b257e2c9bedc9c3db5286f32d261bc93b8e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@ -11,10 +11,10 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index be4431c1..9d2fe4a8 100644
+index f6a8fcae..5e930d79 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -484,4 +484,12 @@ public class PaperWorldConfig {
+@@ -489,4 +489,12 @@ public class PaperWorldConfig {
         squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
     }
 
@ -28,7 +28,7 @@ index be4431c1..9d2fe4a8 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ed0e2acc..579f0ba0 100644
+index fcf6bac0..3092913f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -876,6 +876,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -280,5 +280,5 @@ index e9315f2d..5198a590 100644
                 flag = true;
             } else if (a(itemstack1, itemstack)) {
 -- 
-2.14.1.windows.1
+2.17.0

--- a/Spigot-Server-Patches/0289-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0289-Configurable-sprint-interruption-on-attack.patch
@ -1,4 +1,4 @@
-From 2a9acabb8400a4e9b446057dbd4893491b68b9b6 Mon Sep 17 00:00:00 2001
+From 02d1a77b8eb9fbaf23afe0f5b09bca76497f1369 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7a03f885..9ef2b163 100644
+index 9a5939a7..2bdedd83 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -497,4 +497,9 @@ public class PaperWorldConfig {
+@@ -502,4 +502,9 @@ public class PaperWorldConfig {
         disableHopperMoveEvents = getBoolean("hopper.disable-move-event", disableHopperMoveEvents);
         log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled"));
     }
@ -37,5 +37,5 @@ index 35fde8b2..0b51903e 100644
 
                         if (flag3) {
 -- 
-2.14.1.windows.1
+2.17.0

--- a/Spigot-Server-Patches/0290-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
+++ b/Spigot-Server-Patches/0290-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
@ -1,4 +1,4 @@
-From 81ae8d6dcf6c9f936583ba0c8fa5577c538d2f18 Mon Sep 17 00:00:00 2001
+From 71c7eb43fbd717cf08670a91d16a87530ac8f66d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Apr 2018 11:21:48 -0400
 Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders
@ -7,10 +7,10 @@ This disables the behavior that allows players to keep chunks permanently loaded
 by default and allows server operators to enable it if they wish.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9ef2b1635..cc1914d8c 100644
+index 2bdedd83..ba5332c3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -502,4 +502,10 @@ public class PaperWorldConfig {
+@@ -507,4 +507,10 @@ public class PaperWorldConfig {
     private void disableSprintInterruptionOnAttack() {
         disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
     }
@ -22,7 +22,7 @@ index 9ef2b1635..cc1914d8c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 55dada668..0eba3df57 100644
+index 55dada66..0eba3df5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -148,7 +148,7 @@ public class ChunkProviderServer implements IChunkProvider {
@ -35,5 +35,5 @@ index 55dada668..0eba3df57 100644
 
         if (this.chunkLoader instanceof ChunkRegionLoader) {
 -- 
-2.14.3
+2.17.0

--- a/Spigot-Server-Patches/0294-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0294-Block-Enderpearl-Travel-Exploit.patch
@ -1,4 +1,4 @@
-From c801bfc35cf100dffe42a36980af7d715fa1bafd Mon Sep 17 00:00:00 2001
+From a6a74a356098b9ba2b0a30e99e7792b198f5f325 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@ -12,10 +12,10 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cc1914d8c..606c0bed8 100644
+index ba5332c3..d1acf678 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -508,4 +508,10 @@ public class PaperWorldConfig {
+@@ -513,4 +513,10 @@ public class PaperWorldConfig {
         allowPermaChunkLoaders = getBoolean("game-mechanics.allow-permanent-chunk-loaders", allowPermaChunkLoaders);
         log("Allow Perma Chunk Loaders: " + (allowPermaChunkLoaders ? "enabled" : "disabled"));
     }
@ -27,7 +27,7 @@ index cc1914d8c..606c0bed8 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 01c7fcc8b..8e6428a0c 100644
+index 01c7fcc8..8e6428a0 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
@@ -271,6 +271,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {