From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: AlphaKR93 Date: Tue, 5 Dec 2023 13:29:28 +0900 Subject: [PATCH] Add Entity spawn deadlock timer [REFERENCE] - AbsolemJackdaw/FixMySpawnR diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java index 914564a528c360f352927e7681ab2e31ed365b21..090643e977257a097a99a3f54d1d73b995cfd82a 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -46,6 +46,8 @@ public abstract class BaseSpawner { public int requiredPlayerRange = 16; public int spawnRange = 4; private int tickDelay = 0; // Paper + private int blockExistsTick = 0; // Plazma - Implement FixMySpawnR + private boolean blockLockedByTime = false; // Plazma - Implement FixMySpawnR // Paper start - ported from 1.20.3 Fix MC-259321 static net.minecraft.world.level.entity.EntityTypeTest forExactClass(Class clazz) { return new net.minecraft.world.level.entity.EntityTypeTest<>() { @@ -97,6 +99,17 @@ public abstract class BaseSpawner { } public void serverTick(ServerLevel world, BlockPos pos) { + // Plazma start - Implement FixMySpawnR + if (world.plazmaConfig().entity.spawnDeadlockTimer.enabled) { + if (!this.blockLockedByTime) { + if (this.blockExistsTick > world.plazmaConfig().entity.spawnDeadlockTimer.timerTimeout) + blockLockedByTime = true; + else blockExistsTick++; + } + + if (blockLockedByTime && world.getBestNeighborSignal(pos) > 0) return; + } + // Plazma end if (spawnCount <= 0 || maxNearbyEntities <= 0) return; // Paper - Ignore impossible spawn tick // Paper start - Configurable mob spawner tick rate if (spawnDelay > 0 && --tickDelay > 0) return; @@ -301,6 +314,12 @@ public abstract class BaseSpawner { if (nbt.contains("SpawnRange", 99)) { this.spawnRange = nbt.getShort("SpawnRange"); } + // Plazma start - Implement FixMySpawnR + if (nbt.contains("Plazma.SpawnerTicks", 99)) { + this.blockExistsTick = nbt.getInt("Plazma.SpawnerTicks"); + this.blockLockedByTime = nbt.getBoolean("Plazma.SpawnerLocked"); + } + // Plazma end this.displayEntity = null; } @@ -330,6 +349,9 @@ public abstract class BaseSpawner { })); } + nbt.putInt("Plazma.SpawnerTicks", this.blockExistsTick); // Plazma - Implement FixMySpawnR + nbt.putBoolean("Plazma.SpawnerLocked", this.blockLockedByTime); // Plazma - Implement FixMySpawnR + nbt.put("SpawnPotentials", (Tag) SpawnData.LIST_CODEC.encodeStart(NbtOps.INSTANCE, this.spawnPotentials).result().orElseThrow()); return nbt; } diff --git a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java index b1293935e55fcb1c45224e5bda9be8d1045ff4e8..e5e0b0f0bd3b2249dc1db029682b8957b0addcac 100644 --- a/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java +++ b/src/main/java/org/plazmamc/plazma/configurations/WorldConfigurations.java @@ -54,6 +54,14 @@ public class WorldConfigurations extends ConfigurationPart { } + public SpawnDeadlockTimer spawnDeadlockTimer; + public class SpawnDeadlockTimer extends ConfigurationPart { + + public boolean enabled = OPTIMIZE; + public int timerTimeout = 0; + + } + } public Structure structure;