From b0cbebdc7bc2a5448cf8585a759c3a0c608742fb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 30 Aug 2020 14:38:49 -0400 Subject: [PATCH] Fix build conflicts --- ...{0221-Brand-support.patch => 0222-Brand-support.patch} | 0 ...ch => 0566-Add-zombie-targets-turtle-egg-config.patch} | 0 ...ns-to-world.patch => 0567-Buffer-joins-to-world.patch} | 0 ...rithm.patch => 0568-Optimize-redstone-algorithm.patch} | 8 ++++---- ...ix-hex-colors-not-working-in-some-kick-messages.patch} | 0 ...on.patch => 0570-Fix-NPE-in-getBedSpawnLocation.patch} | 0 ...0571-PortalCreateEvent-needs-to-know-its-entity.patch} | 0 ...ll-check.patch => 0572-Fix-CraftTeam-null-check.patch} | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename Spigot-API-Patches/{0221-Brand-support.patch => 0222-Brand-support.patch} (100%) rename Spigot-Server-Patches/{0565-Add-zombie-targets-turtle-egg-config.patch => 0566-Add-zombie-targets-turtle-egg-config.patch} (100%) rename Spigot-Server-Patches/{0565-Buffer-joins-to-world.patch => 0567-Buffer-joins-to-world.patch} (100%) rename Spigot-Server-Patches/{0566-Optimize-redstone-algorithm.patch => 0568-Optimize-redstone-algorithm.patch} (99%) rename Spigot-Server-Patches/{0567-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0569-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%) rename Spigot-Server-Patches/{0568-Fix-NPE-in-getBedSpawnLocation.patch => 0570-Fix-NPE-in-getBedSpawnLocation.patch} (100%) rename Spigot-Server-Patches/{0569-PortalCreateEvent-needs-to-know-its-entity.patch => 0571-PortalCreateEvent-needs-to-know-its-entity.patch} (100%) rename Spigot-Server-Patches/{0570-Fix-CraftTeam-null-check.patch => 0572-Fix-CraftTeam-null-check.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/0565-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0566-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from Spigot-Server-Patches/0565-Add-zombie-targets-turtle-egg-config.patch rename to Spigot-Server-Patches/0566-Add-zombie-targets-turtle-egg-config.patch diff --git a/Spigot-Server-Patches/0565-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0567-Buffer-joins-to-world.patch similarity index 100% rename from Spigot-Server-Patches/0565-Buffer-joins-to-world.patch rename to Spigot-Server-Patches/0567-Buffer-joins-to-world.patch diff --git a/Spigot-Server-Patches/0566-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0568-Optimize-redstone-algorithm.patch similarity index 99% rename from Spigot-Server-Patches/0566-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0568-Optimize-redstone-algorithm.patch index 2a5e78f886..7200dec797 100644 --- a/Spigot-Server-Patches/0566-Optimize-redstone-algorithm.patch +++ b/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 { - maxLightningFlashDistance = 512; // Vanilla value - } +@@ -659,4 +659,14 @@ public class PaperWorldConfig { + private void zombiesTargetTurtleEggs() { + zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs); } + + public boolean useEigencraftRedstone = false; diff --git a/Spigot-Server-Patches/0567-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0569-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from Spigot-Server-Patches/0567-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to Spigot-Server-Patches/0569-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/Spigot-Server-Patches/0568-Fix-NPE-in-getBedSpawnLocation.patch b/Spigot-Server-Patches/0570-Fix-NPE-in-getBedSpawnLocation.patch similarity index 100% rename from Spigot-Server-Patches/0568-Fix-NPE-in-getBedSpawnLocation.patch rename to Spigot-Server-Patches/0570-Fix-NPE-in-getBedSpawnLocation.patch diff --git a/Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0571-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch rename to Spigot-Server-Patches/0571-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/Spigot-Server-Patches/0570-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0572-Fix-CraftTeam-null-check.patch similarity index 100% rename from Spigot-Server-Patches/0570-Fix-CraftTeam-null-check.patch rename to Spigot-Server-Patches/0572-Fix-CraftTeam-null-check.patch