Merge similar grindstone patches

This commit is contained in:
Encode42
2022-01-17 19:07:07 -05:00
parent b639309492
commit b8235eed8d
5 changed files with 29 additions and 57 deletions

View File

@@ -67,10 +67,10 @@ index 9e83f2dea73461f698185f5ffdb6060e422b9494..6b503d7bdd0eb202ff3466dc1f691102
// CraftBukkit start
// this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // Spigot - moved up
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index db40a001cd7bb65615d5df1e7623774ccda45807..ccffa0ffac58da97334c7f1a95f28b1a485f9303 100644
index c21e12f1a3e61a3813e678f74e3919a17a662222..ee01d9b20e5d16110d57083dcf216cc279e8dfec 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -402,4 +402,9 @@ public class PurpurConfig {
@@ -404,4 +404,9 @@ public class PurpurConfig {
private static void tpsCatchup() {
tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
}