Fix build conflicts

Spigot-Server-Patches/0568-Optimize-redstone-algorithm.patch

@@ -19,12 +19,12 @@ 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 d5a1ade21749bba420257f3ece7878f32148d6ff..9b96b1b326169e7963d828eb9d0612c3c8cb428a 100644
+index b286928cca6effb7adf07bfd2882cb6c5bbffcf2..fbfea9e981bdc90d679d315b5e75ba01d3d396a0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -654,4 +654,14 @@ public class PaperWorldConfig {
+@@ -659,4 +659,14 @@ public class PaperWorldConfig {
-             maxLightningFlashDistance = 512; // Vanilla value
+     private void zombiesTargetTurtleEggs() {
-         }
+         zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs);
      }
 +
 +    public boolean useEigencraftRedstone = false;