mirror of
https://github.com/BX-Team/DivineMC.git
synced 2026-01-04 15:31:43 +00:00
4e58ab3809
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@4ce97c1d [ci/skip] Update occurences of version numbers to 1.21.5 (#1658) PurpurMC/Purpur@7f5c4036 Updated Upstream (Paper) PurpurMC/Purpur@4fdf1d11 Updated Upstream (Paper)
44 lines
3.0 KiB
Diff
44 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Tue, 28 Jan 2025 00:54:57 +0300
|
|
Subject: [PATCH] Implement Secure Seed
|
|
|
|
Original license: GPLv3
|
|
Original project: https://github.com/plasmoapp/matter
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
index 400e632208d133a3f49fc7f14bceb48a1026769b..4954625e4f1af358ca7c70a57be30dee92ace0e6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
@@ -196,7 +196,12 @@ public class CraftChunk implements Chunk {
|
|
@Override
|
|
public boolean isSlimeChunk() {
|
|
// 987234911L is taken from Slime when seeing if a slime can spawn in a chunk
|
|
- return this.level.paperConfig().entities.spawning.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), level.spigotConfig.slimeSeed).nextInt(10) == 0; // Paper
|
|
+ // DivineMC start - Implement Secure Seed
|
|
+ boolean isSlimeChunk = org.bxteam.divinemc.DivineConfig.enableSecureSeed
|
|
+ ? this.level.getChunk(this.getX(), this.getZ()).isSlimeChunk()
|
|
+ : WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), this.level.spigotConfig.slimeSeed).nextInt(10) == 0; // Paper
|
|
+ return this.level.paperConfig().entities.spawning.allChunksAreSlimeChunks || isSlimeChunk;
|
|
+ // DivineMC end - Implement Secure Seed
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 0692d244b3375a3821c8623ee2b301185856fda1..7100d277295c9765c6859903726ee3cee9b6dffe 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -1377,7 +1377,11 @@ public final class CraftServer implements Server {
|
|
registryAccess = levelDataAndDimensions.dimensions().dimensionsRegistryAccess();
|
|
} else {
|
|
LevelSettings levelSettings;
|
|
- WorldOptions worldOptions = new WorldOptions(creator.seed(), creator.generateStructures(), creator.bonusChest());
|
|
+ // DivineMC start - Implement Secure Seed
|
|
+ WorldOptions worldOptions = org.bxteam.divinemc.DivineConfig.enableSecureSeed
|
|
+ ? new WorldOptions(creator.seed(), su.plo.matter.Globals.createRandomWorldSeed(), creator.generateStructures(), false)
|
|
+ : new WorldOptions(creator.seed(), creator.generateStructures(), false);
|
|
+ // DivineMC end - Implement Secure Seed
|
|
WorldDimensions worldDimensions;
|
|
|
|
DedicatedServerProperties.WorldDimensionData properties = new DedicatedServerProperties.WorldDimensionData(GsonHelper.parse((creator.generatorSettings().isEmpty()) ? "{}" : creator.generatorSettings()), creator.type().name().toLowerCase(Locale.ROOT));
|