Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-03 23:07:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix build conflicts

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Spigot-API-Patches/0221-Brand-support.patch → Spigot-API-Patches/0222-Brand-support.patch
View File

4
Spigot-Server-Patches/Optimize-redstone-algorithm.patch
View File

@ -23,8 +23,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@ public class PaperWorldConfig { @@ -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; + public boolean useEigencraftRedstone = false;