Fix build conflicts

This commit is contained in:
Aikar 2020-08-30 14:38:49 -04:00
parent a67734d483
commit d417f6d48b
2 changed files with 2 additions and 2 deletions

View file

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