Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

move timings config to the right place (#130)

Browse Source
This commit is contained in:
foss-mc
2021-01-09 12:18:26 +08:00
committed by GitHub
parent f1390cd915
commit be50f97ae8
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0004-Timings-stuff.patch
View File

@@ -56,3 +56,17 @@ index 5dfa0658838c4801cdf260eae8b98163f729e5af..dae2e5d70756c5b61163d57099b65f7e
con.setDoOutput(true); con.setDoOutput(true);
String hostName = "BrokenHost"; String hostName = "BrokenHost";
try { try {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index cd3272520eb78a9c663bac3bfdb2b63d611d48a1..2f9381e6384d86302378782a580978f7dd1bddc6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -127,4 +127,9 @@ public class PurpurConfig {
config.addDefault(path, def);
return config.getString(path, config.getString(path));
}
+
+ public static String timingsUrl = "https://timings.pl3x.net";
+ private static void timingsSettings() {
+ timingsUrl = getString("settings.timings.url", timingsUrl);
+ }
}

13
patches/server/0006-Barrels-and-enderchests-6-rows.patch
View File

@@ -107,7 +107,7 @@ index a1c3942cbf9a6c0adc4943b05a1c3859c5f0aed6..953741c1cfd9b5c1e0eac80d1e4c7890
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index cd3272520eb78a9c663bac3bfdb2b63d611d48a1..1705aefab4c16b3b766152fd81c5fc60bbd8d2e7 100644 index 2f9381e6384d86302378782a580978f7dd1bddc6..1705aefab4c16b3b766152fd81c5fc60bbd8d2e7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -7,6 +7,7 @@ import org.bukkit.Bukkit; @@ -7,6 +7,7 @@ import org.bukkit.Bukkit;
@@ -118,16 +118,11 @@ index cd3272520eb78a9c663bac3bfdb2b63d611d48a1..1705aefab4c16b3b766152fd81c5fc60
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -127,4 +128,28 @@ public class PurpurConfig { @@ -132,4 +133,23 @@ public class PurpurConfig {
config.addDefault(path, def); private static void timingsSettings() {
return config.getString(path, config.getString(path)); timingsUrl = getString("settings.timings.url", timingsUrl);
} }
+ +
+ public static String timingsUrl = "https://timings.pl3x.net";
+ private static void timingsSettings() {
+ timingsUrl = getString("settings.timings.url", timingsUrl);
+ }
+
+ public static boolean barrelSixRows = false; + public static boolean barrelSixRows = false;
+ public static boolean enderChestSixRows = false; + public static boolean enderChestSixRows = false;
+ public static boolean enderChestPermissionRows = false; + public static boolean enderChestPermissionRows = false;