Upstream
/
Yatopia
mirror of https://github.com/YatopiaMC/Yatopia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Your local dumbass did it again

This commit is contained in:
Ivan Pekov 2020-10-04 12:10:31 +03:00
parent 9e9a295053
commit 62a4ea74fd
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
patches/server/0001-Yatopia-Server-Fixes.patch
View File

@ -36,6 +36,37 @@ index 8f31dba6a29514aad6e74e265bf000014cd1e3c3..00000000000000000000000000000000
-
- if (names.size() == 1) {
- MinecraftKey name = names.iterator().next();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index e14d71d60c3433c39dcf217d48bd667b2c2b49e1..46ce13100b583d48642c6f3413d2b42507c98036 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -462,4 +462,9 @@ public class PaperConfig {
private static void trackPluginScoreboards() {
trackPluginScoreboards = getBoolean("settings.track-plugin-scoreboards", false);
}
+
+ public static boolean asyncAdvancements;
+ private static void asyncAdvancements() {
+ asyncAdvancements = getBoolean("settings.async-advancements", asyncAdvancements);
+ }
}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java.rej b/src/main/java/com/destroystokyo/paper/PaperConfig.java.rej
deleted file mode 100644
index 0f5cfb7c794fbf5f03e79d7f458d679a648fc1ec..0000000000000000000000000000000000000000
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java.rej
+++ /dev/null
@@ -1,11 +0,0 @@
-diff a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java (rejected hunks)
-@@ -457,4 +457,9 @@ public class PaperConfig {
- private static void maxJoinsPerTick() {
- maxJoinsPerTick = getInt("settings.max-joins-per-tick", 3);
- }
-+
-+ public static boolean asyncAdvancements;
-+ private static void asyncAdvancements() {
-+ asyncAdvancements = getBoolean("settings.async-advancements", asyncAdvancements);
-+ }
- }
diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
index dee9655b89d061ec8218ea2c54660c6003e8548f..253b73cfc597d4c7106d969be7b18c68166128ae 100644
--- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java

2
patches/server/0010-Modify-default-configs.patch
View File

@ -5,7 +5,7 @@ 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 e14d71d60c3433c39dcf217d48bd667b2c2b49e1..f5018d232372a40de4d26293faaafcd7ccde627f 100644
index 46ce13100b583d48642c6f3413d2b42507c98036..e656a62784e7cd399307c0eab2600ae51d89d694 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 {