Remove some patches and fix natural spawn issues

docs/source/configuration.rst

@@ -35,16 +35,6 @@ verbose
 * **default**: false
 * **description**: Sets whether the server should dump all configuration values to the server log on startup.
 
-enable-tick-overload
-~~~~~~~~~~~~~~~~~~~~
-* **default**: false
-* **description**: Enable/disable the vanilla tick overload detection ("Can't keep up! Is the server overloaded?")
-
-enable-tps-catchup
-~~~~~~~~~~~~~~~~~~
-* **default**: false
-* **description**: Enable/disable Spigot's TPS catchup (makes everything tick faster than 20 tps after lag spikes, which can cause more lag - also skews /tps reports by ruining the average with above 20 tps entries)
-
 lagging-threshold:
 * **default**: 19.0
 * **description**: Purpur keeps track of when it is lagging in order to have the ability to change behaviors accordingly. This value is that threshold when you want to consider the server to be lagging. Right now this is only used for mob.villager.brain-ticks setting.

patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch

@@ -1,4 +1,4 @@
-From b27bc98e22f0c21525465d23a6c0ef7e727a9d5e Mon Sep 17 00:00:00 2001
+From 4f0ade4ca03aa897cb0667065159ac29297453fb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 12 May 2019 00:43:12 -0500
 Subject: [PATCH] Make giants naturally spawn and have AI
@@ -7,8 +7,9 @@ Subject: [PATCH] Make giants naturally spawn and have AI
  .../java/net/minecraft/server/BiomeBase.java  |  1 +
  .../java/net/minecraft/server/Biomes.java     | 25 ++++++++++++++++
  .../minecraft/server/EntityGiantZombie.java   | 30 +++++++++++++++++--
+ .../net/minecraft/server/SpawnerCreature.java |  8 +++++
  .../java/net/pl3x/purpur/PurpurConfig.java    |  7 +++++
- 4 files changed, 61 insertions(+), 2 deletions(-)
+ 5 files changed, 69 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
 index a86ece8344..fbbb3b7c51 100644
@@ -101,6 +102,25 @@ index 29e7639ad6..e69e7a456d 100644
 +        return super.a(blockposition, iworldreader); // Purpur - fix light requirements for natural spawns
      }
  }
+diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
+index 5e6559df0b..2d4ea99f16 100644
+--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
++++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
+@@ -78,6 +78,14 @@ public final class SpawnerCreature {
+                                             if (biomebase_biomemeta.b.e() != EnumCreatureType.MISC && (biomebase_biomemeta.b.d() || d0 <= 16384.0D)) {
+                                                 EntityTypes<?> entitytypes = biomebase_biomemeta.b;
+
++                                                // Purpur start
++                                                if (entitytypes == EntityTypes.GIANT) {
++                                                    if (!net.pl3x.purpur.PurpurConfig.giantsNaturallySpawn) {
++                                                        return amountSpawned;
++                                                    }
++                                                }
++                                                // Purpur end
++
+                                                 if (entitytypes.b() && a(chunkgenerator, enumcreaturetype, biomebase_biomemeta, (BlockPosition) blockposition_mutableblockposition)) {
+                                                     EntityPositionTypes.Surface entitypositiontypes_surface = EntityPositionTypes.a(entitytypes);
+
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 index 2b67041f45..ad807268c9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java

patches/server/0018-Campfires-should-fall-with-gravity.patch → patches/server/0017-Campfires-should-fall-with-gravity.patch

@@ -1,4 +1,4 @@
-From a0a4abaa7e4b3ee773d5ed33d845fc743dbdf541 Mon Sep 17 00:00:00 2001
+From 0dadc82e89e4d910e53652e5aee29708940477e0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 16:20:21 -0500
 Subject: [PATCH] Campfires should fall with gravity
@@ -10,7 +10,7 @@ Subject: [PATCH] Campfires should fall with gravity
  3 files changed, 31 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 8e16162a7..47a3ddd7f 100644
+index 36c84d75e2..f9747fb18d 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -375,6 +375,7 @@ public class Block implements IMaterial {
@@ -22,7 +22,7 @@ index 8e16162a7..47a3ddd7f 100644
          return 10;
      }
 diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
-index 5cbe8e68e..eca3487b0 100644
+index bfac5835c4..d2363d1d2d 100644
 --- a/src/main/java/net/minecraft/server/BlockCampfire.java
 +++ b/src/main/java/net/minecraft/server/BlockCampfire.java
 @@ -72,8 +72,32 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -68,7 +68,7 @@ index 5cbe8e68e..eca3487b0 100644
 
              if (flag) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cea2bcad5..dc2da586e 100644
+index cea2bcad5a..dc2da586e7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -61,6 +61,11 @@ public class PurpurWorldConfig {

patches/server/0019-Packed-Barrels.patch → patches/server/0018-Packed-Barrels.patch

@@ -1,4 +1,4 @@
-From 577d81729195cc19c5f0104fab3afb4ff001f3d2 Mon Sep 17 00:00:00 2001
+From 0cdd904a8785ee74ecca1c86bf908dd312b058da Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 21:50:37 -0500
 Subject: [PATCH] Packed Barrels
@@ -40,7 +40,7 @@ index 5d80ec8010..dd8c6e8876 100644
      }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c58931392a..fa89e29652 100644
+index ad807268c9..b59707dd78 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -6,6 +6,7 @@ import org.bukkit.Bukkit;
@@ -51,7 +51,7 @@ index c58931392a..fa89e29652 100644
 
  import java.io.File;
  import java.io.IOException;
-@@ -171,6 +172,12 @@ public class PurpurConfig {
+@@ -164,6 +165,12 @@ public class PurpurConfig {
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }
 

patches/server/0020-Right-click-to-open-sign-editor.patch → patches/server/0019-Right-click-to-open-sign-editor.patch

@@ -1,4 +1,4 @@
-From e1cb4d184b4548f4895327d7cb1ce9aef6904eaf Mon Sep 17 00:00:00 2001
+From d3ac2ab0ac6e0054d8a0c2fbcf36128e89eb223c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 24 May 2019 02:39:25 -0500
 Subject: [PATCH] Right click to open sign editor
@@ -9,7 +9,7 @@ Subject: [PATCH] Right click to open sign editor
  2 files changed, 15 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/BlockSign.java b/src/main/java/net/minecraft/server/BlockSign.java
-index b6d7689d5..746709025 100644
+index e058a85ba6..b1e0e9435f 100644
 --- a/src/main/java/net/minecraft/server/BlockSign.java
 +++ b/src/main/java/net/minecraft/server/BlockSign.java
 @@ -52,6 +52,16 @@ public abstract class BlockSign extends BlockTileEntity implements IBlockWaterlo
@@ -30,7 +30,7 @@ index b6d7689d5..746709025 100644
              } else {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6e6d6defd..7f996591f 100644
+index dc2da586e7..ee92fd26e6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -61,6 +61,11 @@ public class PurpurWorldConfig {

patches/server/0021-Bring-back-server-name.patch → patches/server/0020-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From c488ed44e41728d9dc7187efbc5d16abfa2235da Mon Sep 17 00:00:00 2001
+From 35209216787f90f9b5378c441c16d8ff7b10a42c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 8 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
-index fb092a941..54c0b4247 100644
+index 0c3ec83570..20c143e314 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
 @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
@@ -21,7 +21,7 @@ index fb092a941..54c0b4247 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ae290996d..875c16688 100644
+index 3fea9de67a..34a6d26a2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2164,4 +2164,11 @@ public final class CraftServer implements Server {

patches/server/0022-Add-village-raid-spawn-reason.patch → patches/server/0021-Add-village-raid-spawn-reason.patch

@@ -1,4 +1,4 @@
-From 3db95c119f25660486d19e952c5404130ffa6d2c Mon Sep 17 00:00:00 2001
+From ce582c4dd08f5a14735aece2c8fc6ee6baa194ec Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 29 May 2019 23:39:04 -0500
 Subject: [PATCH] Add village raid spawn reason

patches/server/0023-Advancement-API-Additions.patch → patches/server/0022-Advancement-API-Additions.patch

@@ -1,4 +1,4 @@
-From c65db504cbfde1595c4665f0118f9362ec5a2bb9 Mon Sep 17 00:00:00 2001
+From 4b4c998f0f0fda79a87c37d2a65a5168b2917293 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:33 -0500
 Subject: [PATCH] Advancement API Additions
@@ -13,7 +13,7 @@ Subject: [PATCH] Advancement API Additions
  create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 
 diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java
-index 3ef2f4d2a..ac4c29f2b 100644
+index 3ef2f4d2ac..ac4c29f2b6 100644
 --- a/src/main/java/net/minecraft/server/Advancement.java
 +++ b/src/main/java/net/minecraft/server/Advancement.java
 @@ -20,7 +20,7 @@ import org.apache.commons.lang3.ArrayUtils;
@@ -26,7 +26,7 @@ index 3ef2f4d2a..ac4c29f2b 100644
      private final MinecraftKey d;
      private final Map<String, Criterion> e;
 diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
-index e8172d56f..dc6a0448d 100644
+index e8172d56fe..dc6a0448d4 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDisplay.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java
 @@ -20,6 +20,7 @@ public class AdvancementDisplay {
@@ -66,7 +66,7 @@ index e8172d56f..dc6a0448d 100644
          return this.h;
      }
 diff --git a/src/main/java/net/minecraft/server/AdvancementFrameType.java b/src/main/java/net/minecraft/server/AdvancementFrameType.java
-index a9c49a434..14a35ba4c 100644
+index a9c49a4348..14a35ba4c8 100644
 --- a/src/main/java/net/minecraft/server/AdvancementFrameType.java
 +++ b/src/main/java/net/minecraft/server/AdvancementFrameType.java
 @@ -1,14 +1,22 @@
@@ -96,7 +96,7 @@ index a9c49a434..14a35ba4c 100644
          this.e = i;
          this.f = enumchatformat;
 diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
-index a5aadf285..36da44414 100644
+index a5aadf2850..36da444145 100644
 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
 +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
 @@ -4,6 +4,7 @@ import java.util.Collection;
@@ -119,7 +119,7 @@ index a5aadf285..36da44414 100644
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 new file mode 100644
-index 000000000..aed74fb18
+index 0000000000..aed74fb180
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
 @@ -0,0 +1,43 @@

patches/server/0024-Always-place-dragon-egg-when-dragon-is-killed.patch → patches/server/0023-Always-place-dragon-egg-when-dragon-is-killed.patch

@@ -1,4 +1,4 @@
-From e532d05cd56e22ed4d6a12bde3afa56ccb254e14 Mon Sep 17 00:00:00 2001
+From 7795c0a11b772848111790b97c8ed01531798ce5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 1 Jun 2019 01:16:35 -0500
 Subject: [PATCH] Always place dragon egg when dragon is killed
@@ -31,10 +31,10 @@ index 6700c8c658..f0c77eb6c1 100644
              }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index fa89e29652..27eca5246c 100644
+index b59707dd78..56cf939622 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -178,6 +178,11 @@ public class PurpurConfig {
+@@ -171,6 +171,11 @@ public class PurpurConfig {
          InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
      }
 

patches/server/0026-Fix-outdated-server-showing-in-ping-before-server-fu.patch → patches/server/0024-Fix-outdated-server-showing-in-ping-before-server-fu.patch

@@ -1,4 +1,4 @@
-From c712eb4900aab7f3c00cacee7465b1d442fa2298 Mon Sep 17 00:00:00 2001
+From c1e11502eceaeaa6098d1452beadf708faa8938f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 4 Jun 2019 15:50:08 -0500
 Subject: [PATCH] Fix 'outdated server' showing in ping before server fully

patches/server/0027-Allow-color-codes-on-signs.patch → patches/server/0025-Allow-color-codes-on-signs.patch

@@ -1,4 +1,4 @@
-From c5e3285175b82ce3c644da4269b6c65ca161db14 Mon Sep 17 00:00:00 2001
+From 672cd6a191a770c610a9f83f3bddbc3cbcb6484a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Allow color codes on signs
@@ -23,7 +23,7 @@ index 18695d9b5c..8c59692b2b 100644
      }
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9cf6cc53f4..3869cdeeb6 100644
+index e7b8b2e992..520490d59c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2561,6 +2561,7 @@ public class PlayerConnection implements PacketListenerPlayIn {