Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00
Code Issues Releases Activity

Variable entity wake-up duration

Browse Source
This commit is contained in:
Martijn Muijsers
2023-03-22 00:27:03 +01:00
parent df71461201
commit add3ee8f82
114 changed files with 150 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch
View File

@@ -1,63 +0,0 @@
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 e8ae4449696d73c8c9b8b27d4d2e20db933a72cc..ffef23b9455613e8d9e4cc4e21e52b76603ee1bf 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;