mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 4bcebab1 Add getOfflinePlayerIfCached(String) 67c30690 Fix ghost blocks in ticking view distance 8e6d90c2 [CI-SKIP] Add a GitHub Actions job (#4703) 0ac53efb Avoid crashing clients when fishing loot is empty, Fixes #4235 (#4681) b64ee74a Fix armor stands still doing entity collision Tuinity Changes: 576e2cc Rate limit incoming packets
This commit is contained in:
@@ -18,7 +18,7 @@ index dae2e5d707..55b67f1057 100644
|
||||
}
|
||||
final Object val = config.get(key);
|
||||
diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
|
||||
index 996be9b7f1..1c63474206 100644
|
||||
index 991ad4912a..b21122c6b2 100644
|
||||
--- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
|
||||
+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@@ -26,21 +26,9 @@ index 996be9b7f1..1c63474206 100644
|
||||
|
||||
+import co.aikar.timings.TimingsManager;
|
||||
import com.destroystokyo.paper.util.SneakyThrow;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.TicketType;
|
||||
import org.bukkit.Bukkit;
|
||||
@@ -243,6 +244,11 @@ public final class TuinityConfig {
|
||||
return this.config.getDouble(path, this.worldDefaults.getDouble(path));
|
||||
}
|
||||
|
||||
+ String getString(final String path, final String dfl) {
|
||||
+ this.worldDefaults.addDefault(path, dfl);
|
||||
+ return this.config.getString(path, this.worldDefaults.getString(path));
|
||||
+ }
|
||||
+
|
||||
/** ignored if {@link TuinityConfig#tickWorldsInParallel} == false */
|
||||
public int threads;
|
||||
|
||||
@@ -268,6 +274,19 @@ public final class TuinityConfig {
|
||||
@@ -362,6 +363,19 @@ public final class TuinityConfig {
|
||||
this.spawnLimitAmbient = this.getInt(path + ".ambient", -1);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user