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

Updated Upstream (Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Tuinity Changes:
901ac3525 Optimise BlockSoil nearby water lookup
This commit is contained in:
BillyGalbreath
2021-06-11 09:34:45 -05:00
parent 218df1aafa
commit cb72751f80
6 changed files with 192 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0093-Populator-seed-controls.patch
View File

@@ -18,7 +18,7 @@ index 5e672a0660d0aceffcdb26d185590ca18aa4f023..4b171a2a60e24947e884f8988920f335
}
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 414c8de2bcc10165e2d328a5746899ac087698b4..673fc51f398e3a949f3a31c634c248b0f4ef788e 100644
index 79acb3fbca1abc6260d18ee40f7abb9efd14968b..1938b780d20c1d29d63aefeed7ba42fcd2495986 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 @@
@@ -28,14 +28,26 @@ index 414c8de2bcc10165e2d328a5746899ac087698b4..673fc51f398e3a949f3a31c634c248b0
import com.destroystokyo.paper.util.SneakyThrow;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.TicketType;
@@ -393,6 +394,20 @@ public final class TuinityConfig {
final int threads = this.getInt("tick-threads", -1);
@@ -450,21 +451,19 @@ public final class TuinityConfig {
this.threads = threads == -1 ? TuinityConfig.tickThreads : threads;
}*/
+
- public int spawnLimitMonsters;
- public int spawnLimitAnimals;
- public int spawnLimitWaterAmbient;
- public int spawnLimitWaterAnimals;
- public int spawnLimitAmbient;
+ public Long populatorSeed;
+ public boolean useRandomPopulatorSeed;
+
- private void perWorldSpawnLimit() {
- final String path = "spawn-limits";
-
- this.spawnLimitMonsters = this.getIntRaw(path + ".monsters", -1);
- this.spawnLimitAnimals = this.getIntRaw(path + ".animals", -1);
- this.spawnLimitWaterAmbient = this.getIntRaw(path + ".water-ambient", -1);
- this.spawnLimitWaterAnimals = this.getIntRaw(path + ".water-animals", -1);
- this.spawnLimitAmbient = this.getIntRaw(path + ".ambient", -1);
+ private void populatorSeed() {
+ final String seedString = this.getString("worldgen.seeds.populator", "default");
+ if (seedString.equalsIgnoreCase("random")) {
@@ -44,7 +56,7 @@ index 414c8de2bcc10165e2d328a5746899ac087698b4..673fc51f398e3a949f3a31c634c248b0
+ this.populatorSeed = Long.parseLong(seedString);
+ }
+ if (!TimingsManager.hiddenConfigs.contains("worldgen.seeds.populator")) TimingsManager.hiddenConfigs.add("worldgen.seeds.populator");
+ }
}
+
}