mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-22 16:29:26 +00:00
64 lines
3.6 KiB
Diff
64 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Sun, 25 Dec 2022 19:31:09 +0100
|
|
Subject: [PATCH] Don't load chunks to spawn phantoms
|
|
|
|
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
Gale - https://galemc.org
|
|
|
|
This patch is based on the following patch:
|
|
"Don't load chunks when spawning phantoms"
|
|
By: PureGero <puregero@gmail.com>
|
|
As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
|
|
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
|
index 1c3718d9244513d9fc795dceb564a81375734557..20249e200781daf072ee24102aba69124ca3128a 100644
|
|
--- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
|
+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
|
@@ -73,7 +73,15 @@ public class PhantomSpawner implements CustomSpawner {
|
|
|
|
if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper
|
|
BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
|
|
- BlockState iblockdata = world.getBlockState(blockposition1);
|
|
+ // Gale start - MultiPaper - don't load chunks to spawn phantoms
|
|
+ BlockState iblockdata;
|
|
+ if (world.galeConfig().smallOptimizations.loadChunks.toSpawnPhantoms) {
|
|
+ iblockdata = world.getBlockState(blockposition1);
|
|
+ } else {
|
|
+ iblockdata = world.getBlockStateIfLoaded(blockposition1);
|
|
+ if (iblockdata == null) continue;
|
|
+ }
|
|
+ // Gale end - MultiPaper - don't load chunks to spawn phantoms
|
|
FluidState fluid = world.getFluidState(blockposition1);
|
|
|
|
if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
|
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
index f2e8569007b9d52885696de76b1bd1e1035f8121..75e0128d1f4f5b112f9908373b2e32941c68888e 100644
|
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
@@ -272,6 +272,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
|
|
|
}
|
|
|
|
+ public LoadChunks loadChunks;
|
|
+ public class LoadChunks extends ConfigurationPart {
|
|
+
|
|
+ // Gale start - MultiPaper - don't load chunks to spawn phantoms
|
|
+ /**
|
|
+ * Whether to load chunks to spawn phantoms. If false,
|
|
+ * attempts to spawn a phantom in unloaded chunks will do nothing.
|
|
+ * <ul>
|
|
+ * <li><i>Default</i>: false</li>
|
|
+ * <li><i>Vanilla</i>: true</li>
|
|
+ * </ul>
|
|
+ */
|
|
+ public boolean toSpawnPhantoms = false;
|
|
+ // Gale end - MultiPaper - don't load chunks to spawn phantoms
|
|
+
|
|
+ }
|
|
+
|
|
}
|
|
|
|
public GameplayMechanics gameplayMechanics;
|