Modified Configurable Chunk Inhabited Timer Patch

Replaces the "use-chunk-inhabited-timer" config option with the options "use-fixed-chunk-inhabited-time" and "fixed-chunk-inhabited-time". When using "use-fixed-chunk-inhabited-time=false" everything will be the same like it was with "use-chunk-inhabited-timer=true". When using "use-fixed-chunk-inhabited-time=true" and "fixed-chunk-inhabited-time=0" everything will be the same like it was with "use-chunk-inhabited-timer=false". Instead of just using 0 when all chunks should be treated equally this allows to fine-tune vanilla gameplay.
2024-11-23 02:55:47 +01:00 · 2018-12-12 19:40:29 -05:00 · 2018-12-12 19:40:29 -05:00 · 19b4f78b55
commit 19b4f78b55
parent 7b4fe255d8
36 changed files with 254 additions and 247 deletions
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@ -1,4 +1,4 @@
-From 259b6744896caa040fb92a4e00c28bc562720a00 Mon Sep 17 00:00:00 2001
+From fdf3ad1b2a768fbbbcd50d038efff92f144c23b5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@ -249,7 +249,7 @@ index 000000000..961966e16
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
-index 000000000..cde8ec432
+index 000000000..f0473d9bf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +1,184 @@
@ -314,8 +314,8 @@ index 000000000..cde8ec432
 +        commands = new HashMap<String, Command>();
 +        commands.put("paper", new PaperCommand("paper"));
 +
-+        version = getInt("config-version", 14);
-+        set("config-version", 15);
+        version = getInt("config-version", 16);
+        set("config-version", 16);
 +        readConfig(PaperConfig.class, null);
 +    }
 +
@ -511,7 +511,7 @@ index 000000000..a73865739
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index c841ad8e8..7f56df0b6 100644
+index 1f44d8119..73a326684 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -531,7 +531,7 @@ index c841ad8e8..7f56df0b6 100644
             DedicatedServer.LOGGER.info("Generating keypair");
             this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c9b332f45..d796b7128 100644
+index 27a24b00b..08c17d134 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -135,9 +135,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@ -572,7 +572,7 @@ index 207bad41e..bcdc790ba 100644
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index df21e33f3..433d0ad96 100644
+index 2252fa991..44b381120 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -134,6 +134,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -593,7 +593,7 @@ index df21e33f3..433d0ad96 100644
         this.world = new CraftWorld((WorldServer) this, gen, env);
         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9065bd955..f1813f3d5 100644
+index 8ade4244e..b524adc7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -753,6 +753,7 @@ public final class CraftServer implements Server {
@ -648,7 +648,7 @@ index 9065bd955..f1813f3d5 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 23a503ad4..28a34b54e 100644
+index 8b51997fc..e9ea75579 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -128,6 +128,14 @@ public class Main {
@ -708,5 +708,5 @@ index 95f7a9587..87bc8e2d9 100644
         config.addDefault( "world-settings.default." + path, def );
         return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch
+++ b/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch
@ -0,0 +1,47 @@
+From d558b28c05f4837bd5a31c256e92822f4e8959f4 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Mon, 28 Mar 2016 20:46:14 -0400
+Subject: [PATCH] Configurable Chunk Inhabited Time
+
+Vanilla stores how long a chunk has been active on a server, and dynamically scales some
+aspects of vanilla gameplay to this factor.
+
+For people who want all chunks to be treated equally, you can chose a fixed value.
+
+This allows to fine-tune vanilla gameplay.
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index deb4ec254..d2559f7c4 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -233,4 +233,14 @@ public class PaperWorldConfig {
+     private void firePhysicsEventForRedstone() {
+         firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
+     }
+
+    public int fixedInhabitedTime;
+    private void fixedInhabitedTime() {
+        if (PaperConfig.version < 16) {
+            if (!config.getBoolean("world-settings.default.use-chunk-inhabited-timer", true)) config.set("world-settings.default.fixed-chunk-inhabited-time", 0);
+            if (!config.getBoolean("world-settings." + worldName + ".use-chunk-inhabited-timer", true)) config.set("world-settings." + worldName + ".fixed-chunk-inhabited-time", 0);
+            set("use-chunk-inhabited-timer", null);
+        }
+        fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
+    }
+ }
+diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+index 6a23b1ec2..d065d88f7 100644
+--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -1277,7 +1277,7 @@ public class Chunk implements IChunkAccess {
+     }
+ 
+     public long m() {
+-        return this.z;
+        return world.paperConfig.fixedInhabitedTime < 0 ? this.z : world.paperConfig.fixedInhabitedTime; // Paper
+     }
+ 
+     public void b(long i) {
+-- 
+2.20.0
+
--- a/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Timer.patch
@ -1,40 +0,0 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 28 Mar 2016 20:46:14 -0400
-Subject: [PATCH] Configurable Chunk Inhabited Timer
-
-Vanilla stores how long a chunk has been active on a server, and dynamically scales some
-aspects of vanilla gameplay to this factor.
-
-For people who want all chunks to be treated equally, you can disable the timer.
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -233,4 +233,9 @@ public class PaperWorldConfig {
-     private void firePhysicsEventForRedstone() {
-         firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
-     }
-+
-+    public boolean useInhabitedTime = true;
-+    private void useInhabitedTime() {
-+        useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -1277,7 +1277,7 @@ public class Chunk implements IChunkAccess {
-     }
- 
-     public long m() {
-        return this.z;
-+        return world.paperConfig.useInhabitedTime ? this.z : 0; // Paper
-     }
- 
-     public void b(long i) {
-- 
-2.19.1
-
--- a/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
@ -1,16 +1,16 @@
-From 7bbf9d567a6939c784f7cc7ba40a6900e43fff54 Mon Sep 17 00:00:00 2001
+From 272d84b1e4ba0f99f9573a7ab3c8123f8d3ab2bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dd23ea45e5..17755108a8 100644
+index d2559f7c4..058cd8cc8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -238,4 +238,10 @@ public class PaperWorldConfig {
-     private void useInhabitedTime() {
-         useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
+@@ -243,4 +243,10 @@ public class PaperWorldConfig {
+         }
+         fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
     }
 +
 +    public int grassUpdateRate = 1;
@ -20,7 +20,7 @@ index dd23ea45e5..17755108a8 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
-index b0e08a3365..52ae980d37 100644
+index da6182deb..f1174825c 100644
 --- a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
 +++ b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
@@ -21,6 +21,7 @@ public abstract class BlockDirtSnowSpreadable extends BlockDirtSnow {
@ -32,5 +32,5 @@ index b0e08a3365..52ae980d37 100644
             if (!a((IWorldReader) world, blockposition)) {
                 // CraftBukkit start
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -1,4 +1,4 @@
-From df8e7b1824be958b80d4e017f551637ddd58a43d Mon Sep 17 00:00:00 2001
+From d6e138e030d90d72795ada5cf94cb506af0ef6ad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 17755108a..6fe3c0ea8 100644
+index 058cd8cc8..276dd98fd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -244,4 +244,10 @@ public class PaperWorldConfig {
+@@ -249,4 +249,10 @@ public class PaperWorldConfig {
         grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
         log("Grass Spread Tick Rate: " + grassUpdateRate);
     }
@ -21,7 +21,7 @@ index 17755108a..6fe3c0ea8 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5e7a68c4b..18635e820 100644
+index 051608e38..7793626b5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -490,13 +490,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -63,7 +63,7 @@ index 5e7a68c4b..18635e820 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7d83c0236..466ea22be 100644
+index 481a462f8..e64a95ece 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2902,8 +2902,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -78,7 +78,7 @@ index 7d83c0236..466ea22be 100644
 
     public LongSet ag() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8f1da59c5..b79f75bb0 100644
+index 082e86963..b89c5f4ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1004,7 +1004,7 @@ public final class CraftServer implements Server {
@ -107,5 +107,5 @@ index a784bf6f6..24e504c27 100644
                     loadChunk(chunkCoordX + x, chunkCoordZ + z);
                 } else {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@ -1,4 +1,4 @@
-From 0638f275a02576830d8a2695c00877970a18b3f4 Mon Sep 17 00:00:00 2001
+From 77c47f231d1a936f15d3dc8863d9e3362d0ca76d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@ -12,10 +12,10 @@ for this on CB at one point but I can't find it. We may need to do this
 ourselves 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 6fe3c0ea8..cf523a3e4 100644
+index 276dd98fd..973ea8bca 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -250,4 +250,9 @@ public class PaperWorldConfig {
+@@ -255,4 +255,9 @@ public class PaperWorldConfig {
         keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
         log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
     }
@ -73,5 +73,5 @@ index 8c10a0da1..2cb5869ae 100644
         worldserver = server.getWorldServer(entityplayer.dimension);  // CraftBukkit - Update in case join event changed it
         playerconnection.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
@ -1,14 +1,14 @@
-From 86865ac2701a1c6e8db4e3f4ec3ac848656b2ca1 Mon Sep 17 00:00:00 2001
+From 7972a6a1c23e96a84c0e78c20c5fac7732a33d1f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cf523a3e48..4f921dbd38 100644
+index 973ea8bca..7c7d5595a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -255,4 +255,14 @@ public class PaperWorldConfig {
+@@ -260,4 +260,14 @@ public class PaperWorldConfig {
     private void useVanillaScoreboardColoring() {
         useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
     }
@ -24,7 +24,7 @@ index cf523a3e48..4f921dbd38 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index af6c744ad3..7bea86f52b 100644
+index af6c744ad..7bea86f52 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
@@ -11,19 +11,20 @@ public class BlockIceFrost extends BlockIce {
@ -51,5 +51,5 @@ index af6c744ad3..7bea86f52b 100644
     }
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
@ -1,4 +1,4 @@
-From ee11206efc611cd41bc39f6d33f8cc9092449b3a Mon Sep 17 00:00:00 2001
+From e32c5e652c24937db46d8609de109d5e5f7492dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4f921dbd38..db3e70e97a 100644
+index 7c7d5595a..00f0451ef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -265,4 +265,26 @@ public class PaperWorldConfig {
+@@ -270,4 +270,26 @@ public class PaperWorldConfig {
         this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
         log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
     }
@ -43,7 +43,7 @@ index 4f921dbd38..db3e70e97a 100644
 }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
 new file mode 100644
-index 0000000000..d6fce3112e
+index 000000000..d6fce3112
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
@@ -0,0 +1,33 @@
@ -82,7 +82,7 @@ index 0000000000..d6fce3112e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
 new file mode 100644
-index 0000000000..5e637782d5
+index 000000000..5e637782d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
@@ -0,0 +1,28 @@
@ -116,7 +116,7 @@ index 0000000000..5e637782d5
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
 new file mode 100644
-index 0000000000..856843fc91
+index 000000000..856843fc9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
@@ -0,0 +1,71 @@
@ -193,7 +193,7 @@ index 0000000000..856843fc91
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 new file mode 100644
-index 0000000000..6e17af86a0
+index 000000000..6e17af86a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
@@ -0,0 +1,179 @@
@ -378,7 +378,7 @@ index 0000000000..6e17af86a0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
 new file mode 100644
-index 0000000000..f9fbc221bd
+index 000000000..f9fbc221b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
@@ -0,0 +1,64 @@
@ -448,7 +448,7 @@ index 0000000000..f9fbc221bd
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 new file mode 100644
-index 0000000000..d50410532c
+index 000000000..d50410532
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
@@ -0,0 +1,67 @@
@ -520,7 +520,7 @@ index 0000000000..d50410532c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 83de2d63a5..1474209a1e 100644
+index e60e8e8fe..3846e36f7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -69,6 +69,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -532,7 +532,7 @@ index 83de2d63a5..1474209a1e 100644
 
     public CraftEntity getBukkitEntity() {
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 8945ab275b..184809b832 100644
+index 8945ab275..184809b83 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
@@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp
@ -591,7 +591,7 @@ index 8945ab275b..184809b832 100644
 
             if (this.lootTableSeed == 0L) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index 25328bf414..6e3779c417 100644
+index 25328bf41..6e3779c41 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
@@ -4,9 +4,10 @@ import java.util.Random;
@ -646,7 +646,7 @@ index 25328bf414..6e3779c417 100644
             if (this.h == 0L) {
                 random = new Random();
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index ac9b4297b2..0558cafe31 100644
+index ac9b4297b..0558cafe3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -61,7 +61,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@ -659,7 +659,7 @@ index ac9b4297b2..0558cafe31 100644
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index dff5bb5171..c3e40aa172 100644
+index dff5bb517..c3e40aa17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
@@ -1,6 +1,7 @@
@ -680,7 +680,7 @@ index dff5bb5171..c3e40aa172 100644
     public CraftChest(final Block block) {
         super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-index 7ef68bb626..daf183fb10 100644
+index 7ef68bb62..daf183fb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
@@ -1,5 +1,6 @@
@ -709,7 +709,7 @@ index 7ef68bb626..daf183fb10 100644
         getSnapshot().setLootTable(key, seed);
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index 1b5b266c05..e0b99207b2 100644
+index 1b5b266c0..e0b99207b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
@@ -1,5 +1,6 @@
@ -729,7 +729,7 @@ index 1b5b266c05..e0b99207b2 100644
 
     public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-index 87303ecd13..6790fa2fee 100644
+index 87303ecd1..6790fa2fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
@@ -47,7 +47,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo
@ -742,7 +742,7 @@ index 87303ecd13..6790fa2fee 100644
         getHandle().a(newKey, seed);
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index f29365c948..1937f7b9a2 100644
+index f29365c94..1937f7b9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
@@ -1,5 +1,6 @@
@ -762,5 +762,5 @@ index f29365c948..1937f7b9a2 100644
 
     public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
@ -1,11 +1,11 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 709e2779fa366bca564304e1fdd83b6940a387cf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 00f0451ef..42d951554 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@ -16,7 +16,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.spigotmc.SpigotWorldConfig;
 
-@@ -287,4 +286,14 @@ public class PaperWorldConfig {
+@@ -292,4 +291,14 @@ public class PaperWorldConfig {
             );
         }
     }
@ -32,7 +32,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index be1c800c9..c065b2728 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1173,6 +1173,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -61,7 +61,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 2c28633c4..e5170b4e6 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
@ -115,5 +115,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +    // Paper end
 }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@ -1,4 +1,4 @@
-From 675812f4004abac1cb4ee36a8564d3c268195253 Mon Sep 17 00:00:00 2001
+From cf990aab8061ae3fb5211f0765056a0c0cb18e85 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
@ -20,10 +20,10 @@ This also makes the Chunk GC System useless, by auto scheduling unload as soon a
 a spare chunk is added to the server thats outside of view distance.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ff1a2046f..0cd15c17e 100644
+index 42d951554..d8f258105 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -296,4 +296,18 @@ public class PaperWorldConfig {
+@@ -301,4 +301,18 @@ public class PaperWorldConfig {
         preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
         log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
     }
@ -43,7 +43,7 @@ index ff1a2046f..0cd15c17e 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 757105c6f..9328c21cd 100644
+index d065d88f7..2a9bfd7af 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -36,6 +36,7 @@ public class Chunk implements IChunkAccess {
@ -227,5 +227,5 @@ index d08ef3fe1..081789a8f 100644
     }
 }
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
@ -1,4 +1,4 @@
-From f3f73f4392a3801bfe4b3de63f2611b5336e4a4b Mon Sep 17 00:00:00 2001
+From cf6a10fd06d8de714535f84169f67871c80f0f6f 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 c278ac98d..ae3d0f8f7 100644
+index 51b0dd972..9f8b43d2a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -269,4 +269,15 @@ public class PaperConfig {
@ -32,7 +32,7 @@ index c278ac98d..ae3d0f8f7 100644
 +    }
 }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0cd15c17e..c43152f45 100644
+index d8f258105..47bfb5b62 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 0cd15c17e..c43152f45 100644
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.spigotmc.SpigotWorldConfig;
 
-@@ -310,4 +311,19 @@ public class PaperWorldConfig {
+@@ -315,4 +316,19 @@ public class PaperWorldConfig {
     private void skipEntityTickingInChunksScheduledForUnload() {
         skipEntityTickingInChunksScheduledForUnload = getBoolean("skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
     }
@ -64,7 +64,7 @@ index 0cd15c17e..c43152f45 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9328c21cd..aa2ea7838 100644
+index 2a9bfd7af..2af8a582b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -49,9 +49,9 @@ public class Chunk implements IChunkAccess {
@ -230,5 +230,5 @@ index b37b284a5..6a5a7d1e0 100644
             timings.worldSaveChunks.startTiming(); // Paper
             chunkproviderserver.a(flag);
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch
@ -1,14 +1,14 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From e3ae689d96b38bcb31c49ce06e4347fd2c9729f8 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 7ac07ac07ac0..7ac07ac07ac0 100644
+index 47bfb5b62..e8417cb2e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -326,4 +326,9 @@ public class PaperWorldConfig {
+@@ -331,4 +331,9 @@ public class PaperWorldConfig {
     private void maxAutoSaveChunksPerTick() {
         maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
     }
@ -19,7 +19,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 2af8a582b..9430bccf6 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -839,6 +839,12 @@ public class Chunk implements IChunkAccess {
@ -44,5 +44,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
         if (this.i) {
             TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@ -1,4 +1,4 @@
-From 3608095e0066db795059bef9ed824a16c7dd68f0 Mon Sep 17 00:00:00 2001
+From dccb48aa541237c662412c1137a14a650a5ad852 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 0d456bcba..40746c13e 100644
+index e8417cb2e..de59f4ce0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -327,6 +327,11 @@ public class PaperWorldConfig {
+@@ -332,6 +332,11 @@ public class PaperWorldConfig {
         maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
     }
 
@ -54,5 +54,5 @@ index 8fe4c6fec..a2c3c066b 100644
     @Nullable
     public Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException {
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@ -1,11 +1,11 @@
-From db89aad42fed29154f0c27aa6cf8bbdc494da756 Mon Sep 17 00:00:00 2001
+From 5fec8498aa012572f774ed58f9c7f97f488bb23e 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 40746c13ef..5e51aef84c 100644
+index de59f4ce0..03b7410f5 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 40746c13ef..5e51aef84c 100644
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.spigotmc.SpigotWorldConfig;
 
-@@ -336,4 +337,12 @@ public class PaperWorldConfig {
+@@ -341,4 +342,12 @@ public class PaperWorldConfig {
     private void removeCorruptTEs() {
         removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
     }
@ -30,7 +30,7 @@ index 40746c13ef..5e51aef84c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 1fb912eb0d..3c3f82f987 100644
+index bf1556a90..a8500176a 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -228,6 +228,15 @@ public class EntityFallingBlock extends Entity {
@ -50,5 +50,5 @@ index 1fb912eb0d..3c3f82f987 100644
         if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) {
             this.hurtEntities = nbttagcompound.getBoolean("HurtEntities");
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch
@ -1,4 +1,4 @@
-From 454289781f34d6ec68c18191be94b94f8d9e9659 Mon Sep 17 00:00:00 2001
+From 1665f677863e3e0b9ea1969ebeeba47a08f635bc 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 5e51aef84..5d152af15 100644
+index 03b7410f5..5c50c62e5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -345,4 +345,14 @@ public class PaperWorldConfig {
+@@ -350,4 +350,14 @@ public class PaperWorldConfig {
             Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
         }
     }
@ -40,5 +40,5 @@ index 928c5eb41..ac81a8d76 100644
 
             if (blockposition != null) {
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0170-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0170-Cap-Entity-Collisions.patch
@ -1,4 +1,4 @@
-From 1a40170ab4790152fb4a3230349ee47ed673bfaf Mon Sep 17 00:00:00 2001
+From ccb735e983f8aeaee26011afd4004292fcb6c902 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 5d152af15..02d99aec4 100644
+index 5c50c62e5..e49eb0caf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -355,4 +355,10 @@ public class PaperWorldConfig {
+@@ -360,4 +360,10 @@ public class PaperWorldConfig {
             log("Treasure Maps will return already discovered locations");
         }
     }
@ -56,5 +56,5 @@ index 83605e7c7..be0a3f38e 100644
                 this.C(entity);
             }
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@ -1,4 +1,4 @@
-From f95fa75db1294d4a7ecd88f573dac82badd6741d Mon Sep 17 00:00:00 2001
+From d137a62193d8957f4827a0fd88c9dc1ffb3ec296 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 02d99aec4..3507997fc 100644
+index e49eb0caf..aefb0ce97 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -361,4 +361,10 @@ public class PaperWorldConfig {
+@@ -366,4 +366,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 03b986bfa..c8b251e69 100644
         case STOP_SNEAKING:
             this.player.setSneaking(false);
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0180-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0180-provide-a-configurable-option-to-disable-creeper-lin.patch
@ -1,4 +1,4 @@
-From 99b4835e40d1d4ede781bb22ee30b5683d2aff35 Mon Sep 17 00:00:00 2001
+From cce5d1e0dec1f229b70a547a10fa32e296d3fdc3 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 3507997fc3..7c2e0ddb77 100644
+index aefb0ce97..af31030dc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -367,4 +367,10 @@ public class PaperWorldConfig {
+@@ -372,4 +372,10 @@ public class PaperWorldConfig {
         parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
         log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
     }
@ -21,7 +21,7 @@ index 3507997fc3..7c2e0ddb77 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index a1c343d77b..765123e3d2 100644
+index d03c2f4ae..64a5fefad 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -214,7 +214,7 @@ public class EntityCreeper extends EntityMonster {
@ -34,5 +34,5 @@ index a1c343d77b..765123e3d2 100644
 
             entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0213-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0213-Option-for-maximum-exp-value-when-merging-orbs.patch
@ -1,14 +1,14 @@
-From b32669093d9d7936120b2bdcbcb6d1eb27fe5682 Mon Sep 17 00:00:00 2001
+From 56adb5bd9b7aa2531ce2f3f063f755a948a03449 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 7c2e0ddb77..7391a4a6a8 100644
+index af31030dc..b6764c7ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -373,4 +373,10 @@ public class PaperWorldConfig {
+@@ -378,4 +378,10 @@ public class PaperWorldConfig {
         disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
         log("Creeper lingering effect: " + disableCreeperLingeringEffect);
     }
@ -20,7 +20,7 @@ index 7c2e0ddb77..7391a4a6a8 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7712ee9db0..564f2aecdf 100644
+index c1ede0651..15e07ce84 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1032,16 +1032,32 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -60,5 +60,5 @@ index 7712ee9db0..564f2aecdf 100644
         } // Spigot end
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0223-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0223-Configurable-Chunks-Sends-per-Tick-setting.patch
@ -1,4 +1,4 @@
-From 2d9f35af04abffc9bf46670bf90fae53bc5c00bd Mon Sep 17 00:00:00 2001
+From d1d3428265a603b62246b4a89b859957f01eaeb7 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 7391a4a6a8..af69342e6c 100644
+index b6764c7ec..29cb718fb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -379,4 +379,13 @@ public class PaperWorldConfig {
+@@ -384,4 +384,13 @@ public class PaperWorldConfig {
         expMergeMaxValue = getInt("experience-merge-max-value", -1);
         log("Experience Merge Max Value: " + expMergeMaxValue);
     }
@ -26,7 +26,7 @@ index 7391a4a6a8..af69342e6c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 395b5a470f..54f31349e9 100644
+index 9d971a9c5..a696be750 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -172,7 +172,7 @@ public class PlayerChunkMap {
@ -39,5 +39,5 @@ index 395b5a470f..54f31349e9 100644
             Iterator iterator2 = this.g.iterator();
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0224-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0224-Configurable-Max-Chunk-Gens-per-Tick.patch
@ -1,4 +1,4 @@
-From 5f31238e22a6ca4da573ae75fb09824ab8a6aca5 Mon Sep 17 00:00:00 2001
+From e09aa94bd74a5ae4edc39367df7b8d1f562351c1 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 af69342e6c..ca7efc9175 100644
+index 29cb718fb..695bdf2e6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -388,4 +388,15 @@ public class PaperWorldConfig {
+@@ -393,4 +393,15 @@ public class PaperWorldConfig {
         }
         log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
     }
@ -33,7 +33,7 @@ index af69342e6c..ca7efc9175 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 2fd8fa30ee..a0fcac3296 100644
+index 7cb1327a8..4383abccd 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -28,6 +28,7 @@ public class PlayerChunk {
@ -53,7 +53,7 @@ index 2fd8fa30ee..a0fcac3296 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 54f31349e9..d1a443ca8d 100644
+index a696be750..39e5b2484 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -140,6 +140,7 @@ public class PlayerChunkMap {
@ -77,7 +77,7 @@ index 54f31349e9..d1a443ca8d 100644
                     if (playerchunk1.a(flag)) {
                         iterator1.remove();
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 7ffb8f6172..33d5fc7d5e 100644
+index 7ffb8f617..33d5fc7d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
@@ -34,4 +34,10 @@ public class ChunkIOExecutor {
@ -92,7 +92,7 @@ index 7ffb8f6172..33d5fc7d5e 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
-index 193c3621c6..cf1258c559 100644
+index 193c3621c..cf1258c55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
@@ -351,4 +351,10 @@ public final class AsynchronousExecutor<P, T, C, E extends Throwable> {
@ -107,5 +107,5 @@ index 193c3621c6..cf1258c559 100644
 +    // Paper end
 }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0225-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0225-Make-max-squid-spawn-height-configurable.patch
@ -1,4 +1,4 @@
-From b772743743a4424318eec7d23057069599ac64a8 Mon Sep 17 00:00:00 2001
+From 8d22094e65f7e5e6d047591be201629bd123f290 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 ca7efc9175..67b4d576a9 100644
+index 695bdf2e6..313dd9891 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -399,4 +399,9 @@ public class PaperWorldConfig {
+@@ -404,4 +404,9 @@ public class PaperWorldConfig {
             log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
         }
     }
@ -21,7 +21,7 @@ index ca7efc9175..67b4d576a9 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 5d7d0b6910..2dfa794a3f 100644
+index b4ee0a9c7..a5edc5bc2 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -167,7 +167,10 @@ public class EntitySquid extends EntityWaterAnimal {
@ -37,5 +37,5 @@ index 5d7d0b6910..2dfa794a3f 100644
 
     public void c(float f, float f1, float f2) {
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
@ -1,4 +1,4 @@
-From 20f385cb4b8ce6bb47708d047bde887b18d4b3ce Mon Sep 17 00:00:00 2001
+From 25155c9ec86274414859937728b50d961386a7fd 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 02c52958c..fe56f0103 100644
+index 56226bc86..6bb54fcbd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -409,4 +409,9 @@ public class PaperWorldConfig {
+@@ -414,4 +414,9 @@ public class PaperWorldConfig {
     private void squidMaxSpawnHeight() {
         squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
     }
@ -37,5 +37,5 @@ index 507641fc6..2bab2ab92 100644
 
                         if (flag3) {
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0255-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0255-Block-Enderpearl-Travel-Exploit.patch
@ -1,4 +1,4 @@
-From 97aa493a6d38781247226e4c8b22304905ee0297 Mon Sep 17 00:00:00 2001
+From e97bd3b2054b415121bdc5eb131ccd3e207da94e 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 fe56f01035..af6b97708a 100644
+index 6bb54fcbd..9aba755a4 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 {
     private void disableSprintInterruptionOnAttack() {
         disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
     }
@ -27,7 +27,7 @@ index fe56f01035..af6b97708a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index fc8c0cab55..dd8af4be80 100644
+index 431afaf2f..8d41efe8f 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
@@ -242,6 +242,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@ -39,5 +39,5 @@ index fc8c0cab55..dd8af4be80 100644
     }
 
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0261-Configurable-Villages-loading-chunks-for-door-checks.patch
+++ b/Spigot-Server-Patches/0261-Configurable-Villages-loading-chunks-for-door-checks.patch
@ -1,4 +1,4 @@
-From 303049b123b3adb9aea02f550750a9afc8a45887 Mon Sep 17 00:00:00 2001
+From 7a2610b1588363701aabbaabf8924cadaa1d9617 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Configurable Villages loading chunks for door checks
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Villages loading chunks for door checks
 This avoids villages spam loading chunks sync.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index af6b97708a..a005c8c4ec 100644
+index 9aba755a4..2033ace4f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -420,4 +420,12 @@ public class PaperWorldConfig {
+@@ -425,4 +425,12 @@ public class PaperWorldConfig {
         disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
         log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
     }
@ -23,7 +23,7 @@ index af6b97708a..a005c8c4ec 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
-index d14a9e3a3e..0be1bf0d99 100644
+index d14a9e3a3..0be1bf0d9 100644
 --- a/src/main/java/net/minecraft/server/PersistentVillage.java
 +++ b/src/main/java/net/minecraft/server/PersistentVillage.java
@@ -123,7 +123,7 @@ public class PersistentVillage extends PersistentBase {
@ -45,7 +45,7 @@ index d14a9e3a3e..0be1bf0d99 100644
 
     public void a(NBTTagCompound nbttagcompound) {
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index bda67faefe..5b56ae1818 100644
+index a8ca29d37..02d8d9749 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
@@ -11,10 +11,10 @@ import javax.annotation.Nullable;
@ -99,7 +99,7 @@ index bda67faefe..5b56ae1818 100644
 
         return block instanceof BlockDoor ? iblockdata.getMaterial() == Material.WOOD : false;
 diff --git a/src/main/java/net/minecraft/server/VillageDoor.java b/src/main/java/net/minecraft/server/VillageDoor.java
-index 62771547f6..74ac3c1ba6 100644
+index 62771547f..74ac3c1ba 100644
 --- a/src/main/java/net/minecraft/server/VillageDoor.java
 +++ b/src/main/java/net/minecraft/server/VillageDoor.java
@@ -59,6 +59,7 @@ public class VillageDoor {
@ -124,5 +124,5 @@ index 62771547f6..74ac3c1ba6 100644
         this.d = i;
     }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0270-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0270-Make-shield-blocking-delay-configurable.patch
@ -1,14 +1,14 @@
-From 092619ad43618d217d2519f0054de7b7c5a05d17 Mon Sep 17 00:00:00 2001
+From 46da1c9803991fcad8559c8340356353bbb9d894 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a005c8c4e..bd4cca26c 100644
+index 2033ace4f..875650b8d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -428,4 +428,9 @@ public class PaperWorldConfig {
+@@ -433,4 +433,9 @@ public class PaperWorldConfig {
             log("Villages can load chunks - Warning this can cause intense TPS loss. Strongly consider disabling this.");
         }
     }
@ -69,5 +69,5 @@ index 2f96842bb..8e65bfc78 100644
     // Paper end
 }
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0280-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0280-Add-config-to-disable-ender-dragon-legacy-check.patch
@ -1,14 +1,14 @@
-From 9b687f71b81c508894ee9af7696105e89c926ecf Mon Sep 17 00:00:00 2001
+From ca75b9e2215df7923fe306514a5e3514f694d94f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bd4cca26c..85296e48d 100644
+index 875650b8d..74185b31f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -433,4 +433,9 @@ public class PaperWorldConfig {
+@@ -438,4 +438,9 @@ public class PaperWorldConfig {
     private void shieldBlockingDelay() {
         shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
     }
@ -45,5 +45,5 @@ index 1e22aa531..67808446c 100644
 
         for(EntityPlayer entityplayer1 : hashset1) {
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
@ -1,4 +1,4 @@
-From 1084db77a35a4bcf6539b823e3c2fc0dcc531ad9 Mon Sep 17 00:00:00 2001
+From 31a804ff9a03c3897cfd1320fe51638676ff0b57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@ -10,10 +10,10 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 85296e48db..deb0d4f053 100644
+index 74185b31f..92acfa6fb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -438,4 +438,15 @@ public class PaperWorldConfig {
+@@ -443,4 +443,15 @@ public class PaperWorldConfig {
     private void scanForLegacyEnderDragon() {
         scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
     }
@ -30,7 +30,7 @@ index 85296e48db..deb0d4f053 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 2ba61fd81f..c58e7259f4 100644
+index 06f627002..d81a2db6c 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
@@ -187,6 +187,52 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@ -101,5 +101,5 @@ index 2ba61fd81f..c58e7259f4 100644
         return iblockaccess.getType(blockposition.down()).q() && !iblockaccess.getType(blockposition).getMaterial().isBuildable() && !iblockaccess.getType(blockposition.up()).getMaterial().isBuildable();
     }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0297-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0297-Duplicate-UUID-Resolve-Option.patch
@ -1,4 +1,4 @@
-From c776399982299d6cd75dacdcd7f3eb0882a606bd Mon Sep 17 00:00:00 2001
+From 62074554848b01cbe35c0ca21f3372af595eb185 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index deb0d4f05..75b591bc2 100644
+index 92acfa6fb..05509e4fd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -449,4 +449,43 @@ public class PaperWorldConfig {
+@@ -454,4 +454,43 @@ public class PaperWorldConfig {
             log("Bed Search Radius: " + bedSearchRadius);
         }
     }
@ -81,7 +81,7 @@ index deb0d4f05..75b591bc2 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 43583b6ba..1c5737e3f 100644
+index 8ff542c88..bb76f56da 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1,5 +1,10 @@
@ -219,5 +219,5 @@ index 0bb903aab..572c54c9c 100644
             logger.error("Overwrote an existing entity " + old + " with " + entity);
             if (DEBUG_ENTITIES) {
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@ -1,14 +1,14 @@
-From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
+From 5c2993f23b856a9e887f50d7294b5385fd63a9fe Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 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 7ac07ac07ac0..7ac07ac07ac0 100644
+index 05509e4fd..4059c7a72 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -361,6 +361,11 @@ public class PaperWorldConfig {
+@@ -366,6 +366,11 @@ public class PaperWorldConfig {
         }
     }
 
@ -21,7 +21,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
     private void maxEntityCollision() {
         maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7ac07ac07ac0..7ac07ac07ac0 100644
+index 5557e9409..7f23a8e2e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1613,6 +1613,14 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -40,5 +40,5 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
         int i = MathHelper.floor(axisalignedbb.minX);
         int j = MathHelper.f(axisalignedbb.maxX);
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0330-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0330-Allow-disabling-armour-stand-ticking.patch
@ -1,14 +1,14 @@
-From a9d4649439524406e470b98743fd7309c5f42b15 Mon Sep 17 00:00:00 2001
+From cb83a888c2da2df1db872f2a7f8b9a60049f8c82 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a2656abaf..95fc2d8ed 100644
+index 4059c7a72..10efe6b3d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -493,4 +493,10 @@ public class PaperWorldConfig {
+@@ -498,4 +498,10 @@ public class PaperWorldConfig {
                 break;
         }
     }
@ -277,5 +277,5 @@ index 9f5c3b92e..07ce93f17 100644
     // Paper end
 }
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0335-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0335-Optimize-Hoppers.patch
@ -1,4 +1,4 @@
-From 0e1052315579d6638c1e893e288cf325ab05d1c7 Mon Sep 17 00:00:00 2001
+From e3d75ee2a7b865826500b70945a58a969f76cbb7 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 95fc2d8ed..ac07bcc75 100644
+index 10efe6b3d..6feea98b6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -415,6 +415,15 @@ public class PaperWorldConfig {
+@@ -420,6 +420,15 @@ public class PaperWorldConfig {
         squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
     }
 
@ -47,7 +47,7 @@ index 36c8644e2..eea6d9419 100644
         itemstack.d(this.B());
         if (this.tag != null) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 116620984..d83e85dbf 100644
+index ca72e6ad1..49a06f395 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1050,7 +1050,8 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -81,7 +81,7 @@ index 29fe031d8..d67fd92d9 100644
             this.world.b(this.position, this);
             if (!this.f.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index b36ec46bf..10e18bf34 100644
+index 4bb650fa3..cdc576058 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -190,6 +190,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@ -301,5 +301,5 @@ index b36ec46bf..10e18bf34 100644
                 flag = true;
             } else if (a(itemstack1, itemstack)) {
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0340-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0340-Anti-Xray.patch
@ -1,11 +1,11 @@
-From eda7118f1c06e049a257a9423a21c1ef620a4f4f Mon Sep 17 00:00:00 2001
+From 79d8732d462211d9b31611ee6bc486c311a5c2b5 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +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 ac07bcc751..ca93fab889 100644
+index 6feea98b6..2220a18d9 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 ac07bcc751..ca93fab889 100644
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
-@@ -508,4 +511,27 @@ public class PaperWorldConfig {
+@@ -513,4 +516,27 @@ public class PaperWorldConfig {
         this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
         log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
     }
@ -49,7 +49,7 @@ index ac07bcc751..ca93fab889 100644
 }
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 new file mode 100644
-index 0000000000..1ba8477bf9
+index 000000000..1ba8477bf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
@@ -0,0 +1,45 @@
@ -100,7 +100,7 @@ index 0000000000..1ba8477bf9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 new file mode 100644
-index 0000000000..d00e113ba8
+index 000000000..d00e113ba
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
@@ -0,0 +1,670 @@
@ -776,7 +776,7 @@ index 0000000000..d00e113ba8
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
 new file mode 100644
-index 0000000000..a68bace353
+index 000000000..a68bace35
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
@@ -0,0 +1,81 @@
@ -863,7 +863,7 @@ index 0000000000..a68bace353
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
 new file mode 100644
-index 0000000000..e255a45fa3
+index 000000000..e255a45fa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
@@ -0,0 +1,29 @@
@ -898,7 +898,7 @@ index 0000000000..e255a45fa3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 new file mode 100644
-index 0000000000..cc586827aa
+index 000000000..cc586827a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
@@ -0,0 +1,56 @@
@ -960,7 +960,7 @@ index 0000000000..cc586827aa
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 new file mode 100644
-index 0000000000..37093419cf
+index 000000000..37093419c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
@@ -0,0 +1,84 @@
@ -1049,7 +1049,7 @@ index 0000000000..37093419cf
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 585de1bb2f..4e8eb137ae 100644
+index 836aea6c3..44d59d253 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -535,7 +535,7 @@ public class Chunk implements IChunkAccess {
@ -1071,7 +1071,7 @@ index 585de1bb2f..4e8eb137ae 100644
                 this.initLighting();
             }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 2dc5a8594a..9b4bc3ff68 100644
+index f734b85e0..26a3f28cb 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -859,7 +859,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -1093,7 +1093,7 @@ index 2dc5a8594a..9b4bc3ff68 100644
             chunksection.getBlocks().a(nbttagcompound, "Palette", "BlockStates");
             chunksection.a(new NibbleArray(nbttagcompound.getByteArray("BlockLight")));
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 7e4c79a1ce..bdfc7d81ff 100644
+index 7e4c79a1c..bdfc7d81f 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -10,9 +10,15 @@ public class ChunkSection {
@ -1114,7 +1114,7 @@ index 7e4c79a1ce..bdfc7d81ff 100644
         if (flag) {
             this.skyLight = new NibbleArray();
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 95eb1a84ac..34019bd1b3 100644
+index 9deab61fc..ad7e4a036 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
@@ -42,7 +42,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@ -1136,7 +1136,7 @@ index 95eb1a84ac..34019bd1b3 100644
             }) : (Scheduler.a) this.progressCache.get(chunkcoordintpair.a());
         }
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 6e7454b134..71a3636be6 100644
+index 6e7454b13..71a3636be 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
@@ -1,5 +1,6 @@
@ -1271,7 +1271,7 @@ index 6e7454b134..71a3636be6 100644
         int jx = along.length * 64 / 4096;
         if (this.h == this.b) {
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index f8facddb40..b2afec5e4b 100644
+index f8facddb4..b2afec5e4 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -158,8 +158,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@ -1332,7 +1332,7 @@ index f8facddb40..b2afec5e4b 100644
     public void a() {
         this.o();
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 22a262bb60..40ec398eef 100644
+index 22a262bb6..40ec398ee 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
@@ -1,5 +1,6 @@
@ -1418,7 +1418,7 @@ index 22a262bb60..40ec398eef 100644
                 if (flag) {
                     packetdataserializer.writeBytes(chunksection.getSkyLightArray().asBytes());
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index a0fcac3296..2c7c8adf7c 100644
+index 4383abccd..068d203c8 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -118,6 +118,8 @@ public class PlayerChunk {
@ -1449,7 +1449,7 @@ index a0fcac3296..2c7c8adf7c 100644
                 } else {
                     this.a((Packet) (new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, this.chunk)));
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 23223e89d3..23fc4d8e14 100644
+index 23223e89d..23fc4d8e1 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -207,6 +207,8 @@ public class PlayerInteractManager {
@ -1462,7 +1462,7 @@ index 23223e89d3..23fc4d8e14 100644
 
     public void a(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index 0b79c1b16c..6554c7727a 100644
+index b88d41d67..025160679 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
@@ -40,12 +40,24 @@ public class ProtoChunk implements IChunkAccess {
@ -1510,7 +1510,7 @@ index 0b79c1b16c..6554c7727a 100644
 
             if (enumskyblock == EnumSkyBlock.SKY) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bb0a23fcba..d239fc6d3a 100644
+index 0d401bf1d..de591d912 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1,6 +1,8 @@
@ -1547,7 +1547,7 @@ index bb0a23fcba..d239fc6d3a 100644
             if (iblockdata1 == null) {
                 // CraftBukkit start - remove blockstate if failed
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
-index 550416bef0..923d1b2821 100644
+index 550416bef..923d1b282 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
@@ -17,9 +17,11 @@ import org.bukkit.material.MaterialData;
@ -1572,5 +1572,5 @@ index 550416bef0..923d1b2821 100644
         return section;
     }
 -- 
-2.19.1
+2.20.0

--- a/Spigot-Server-Patches/0341-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0341-Configurable-speed-for-water-flowing-over-lava.patch
@ -1,14 +1,14 @@
-From d6f4bf3cc3af82f439d4e22868097a514f3e586e Mon Sep 17 00:00:00 2001
+From f9207700a1c84a637d183465d863ecc241360f02 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ca93fab889..93bf8c6d3c 100644
+index 2220a18d9..94c544714 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -467,6 +467,12 @@ public class PaperWorldConfig {
+@@ -472,6 +472,12 @@ public class PaperWorldConfig {
         }
     }
 
@ -22,7 +22,7 @@ index ca93fab889..93bf8c6d3c 100644
         SAFE_REGEN, DELETE, NOTHING, WARN
     }
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index 5346eaa348..ec77cbd57e 100644
+index 56f26da41..ddf2fc67e 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
@@ -78,11 +78,27 @@ public class BlockFluids extends Block implements IFluidSource {
@ -64,5 +64,5 @@ index 5346eaa348..ec77cbd57e 100644
 
     }
 -- 
-2.19.0
+2.20.0

--- a/Spigot-Server-Patches/0395-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0395-Add-option-to-prevent-players-from-moving-into-unloa.patch
@ -1,4 +1,4 @@
-From 314c9f75522a0f97d2560b4c061f976c1f9510a6 Mon Sep 17 00:00:00 2001
+From e4233c1ede5555a34a70d41c86b40b45f63b4d7a Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@ -6,10 +6,10 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f94fa5df2..1a8a90261 100644
+index 48920b045..77368b17a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -562,4 +562,9 @@ public class PaperWorldConfig {
+@@ -567,4 +567,9 @@ public class PaperWorldConfig {
         replacementBlocks = getList("anti-xray.replacement-blocks", Arrays.asList("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);
     }
@ -64,5 +64,5 @@ index 8e436c7f4..5e8c85cfb 100644
                                 float f2 = this.player.dc() ? 300.0F : 100.0F;
 
 -- 
-2.19.2
+2.20.0

--- a/Spigot-Server-Patches/0407-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0407-Optimize-redstone-algorithm.patch
@ -1,4 +1,4 @@
-From dbfc13582cbdfb8d3f8fa7762e3aa9abbbdb635e Mon Sep 17 00:00:00 2001
+From 4f373a4ea5822c86917b6be304acecb9c4eb274c Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@ -19,10 +19,10 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1a8a90261..69b42be4e 100644
+index 77368b17a..5981a5f51 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -567,4 +567,14 @@ public class PaperWorldConfig {
+@@ -572,4 +572,14 @@ public class PaperWorldConfig {
     private void preventMovingIntoUnloadedChunks() {
         preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
     }
@ -1160,5 +1160,5 @@ index d202360bd..05256ad3c 100644
         int i = 0;
         EnumDirection[] aenumdirection = World.a;
 -- 
-2.19.2
+2.20.0