Fix build conflicts

This commit is contained in:
Aikar 2020-08-30 14:38:49 -04:00
parent dfc54a8b92
commit b0cbebdc7b
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
8 changed files with 4 additions and 4 deletions

View File

@ -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;