From d417f6d48b4b2182b1da4e51c082d5571d66b7d0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 30 Aug 2020 14:38:49 -0400
Subject: [PATCH] Fix build conflicts

---
 .../{0221-Brand-support.patch => 0222-Brand-support.patch}    | 0
 Spigot-Server-Patches/Optimize-redstone-algorithm.patch       | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename Spigot-API-Patches/{0221-Brand-support.patch => 0222-Brand-support.patch} (100%)

diff --git a/Spigot-API-Patches/0221-Brand-support.patch b/Spigot-API-Patches/0222-Brand-support.patch
similarity index 100%
rename from Spigot-API-Patches/0221-Brand-support.patch
rename to Spigot-API-Patches/0222-Brand-support.patch
diff --git a/Spigot-Server-Patches/Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/Optimize-redstone-algorithm.patch
index f131d64978..cf69f1e2dc 100644
--- a/Spigot-Server-Patches/Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/Optimize-redstone-algorithm.patch
@@ -23,8 +23,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
-             maxLightningFlashDistance = 512; // Vanilla value
-         }
+     private void zombiesTargetTurtleEggs() {
+         zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs);
      }
 +
 +    public boolean useEigencraftRedstone = false;