mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-11-26 12:45:52 +01:00
ab272cc991
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: cff9ec0 Updated Upstream (Paper) c3d5d24 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3 5df4a4f Reset the minimum ticket level for delaying unloads (#196) Origami Changes: 23fe2d3 Remove unnecessary map patch. Fixed in Paper faef256 Remove unused stream removal change 3f68c85 Update Paper Purpur Changes: 1720664 Updated Upstream (Tuinity) 6b2b137 Updated Upstream (Paper) afed247 Updated Upstream (Paper) a8a4826 Updated Upstream (Paper) ca4c502 Updated Upstream (Paper) 686ac09 Updated Upstream (Paper) 49dc495 Allow infinite and mending enchantments together
33 lines
1.9 KiB
Diff
33 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: tr7zw <tr7zw@live.de>
|
|
Date: Tue, 21 Apr 2020 16:14:10 +0200
|
|
Subject: [PATCH] Modify default configs
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
index 053da5119404ded5e3cf6bb55967cc8ffba47de6..b1f1df3862455f2d1566a215bca9fc7ca7006118 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
@@ -201,7 +201,7 @@ public class PaperConfig {
|
|
|
|
public static String timingsServerName;
|
|
private static void timings() {
|
|
- boolean timings = getBoolean("timings.enabled", true);
|
|
+ boolean timings = getBoolean("timings.enabled", false); // Yatopia don't profile by default
|
|
boolean verboseTimings = getBoolean("timings.verbose", true);
|
|
TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
|
|
TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses"));
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 26287b3e4007c02b9d78d60453fa16d3cfaae638..b32002c1aa40648fb4732a368f8ff0f345fcda9b 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -591,7 +591,7 @@ public class PaperWorldConfig {
|
|
}
|
|
|
|
public boolean cooldownHopperWhenFull = true;
|
|
- public boolean disableHopperMoveEvents = false;
|
|
+ public boolean disableHopperMoveEvents = true; // Yatopia disable by default
|
|
private void hopperOptimizations() {
|
|
cooldownHopperWhenFull = getBoolean("hopper.cooldown-when-full", cooldownHopperWhenFull);
|
|
log("Cooldown Hoppers when Full: " + (cooldownHopperWhenFull ? "enabled" : "disabled"));
|