PaperMC/patches/server/0044-Configurable-mob-spawner-tick-rate.patch

50 lines
2.2 KiB
Diff
Raw Normal View History

2021-06-12 02:57:04 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 15:03:53 -0600
Subject: [PATCH] Configurable mob spawner tick rate
diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
2023-03-14 19:36:39 +01:00
index 7b60c13cbe3d2a0d0657391a7b6be4e3706720fa..3d4e77327295344a5ef8d1fcde96f1ed2fecfbfa 100644
2021-06-12 02:57:04 +02:00
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
2022-12-07 19:32:25 +01:00
@@ -45,6 +45,7 @@ public abstract class BaseSpawner {
2022-06-07 21:15:06 +02:00
public int maxNearbyEntities = 6;
2021-11-23 13:15:10 +01:00
public int requiredPlayerRange = 16;
public int spawnRange = 4;
2021-06-12 02:57:04 +02:00
+ private int tickDelay = 0; // Paper
2021-11-23 13:15:10 +01:00
public BaseSpawner() {}
2022-12-07 19:32:25 +01:00
@@ -79,13 +80,18 @@ public abstract class BaseSpawner {
2021-06-12 02:57:04 +02:00
}
public void serverTick(ServerLevel world, BlockPos pos) {
+ // Paper start - Configurable mob spawner tick rate
+ if (spawnDelay > 0 && --tickDelay > 0) return;
+ tickDelay = world.paperConfig().tickRates.mobSpawner;
+ if (tickDelay == -1) { return; } // If disabled
2021-06-12 02:57:04 +02:00
+ // Paper end
if (this.isNearPlayer(world, pos)) {
- if (this.spawnDelay == -1) {
+ if (this.spawnDelay < -tickDelay) {
this.delay(world, pos);
}
if (this.spawnDelay > 0) {
- --this.spawnDelay;
+ this.spawnDelay -= tickDelay; // Paper
} else {
boolean flag = false;
2022-12-07 19:32:25 +01:00
RandomSource randomsource = world.getRandom();
@@ -152,8 +158,7 @@ public abstract class BaseSpawner {
2021-06-12 02:57:04 +02:00
((Mob) entity).finalizeSpawn(world, world.getCurrentDifficultyAt(entity.blockPosition()), MobSpawnType.SPAWNER, (SpawnGroupData) null, (CompoundTag) null);
}
// Spigot Start
- if ( entityinsentient.level.spigotConfig.nerfSpawnerMobs )
- {
+ if (entityinsentient.level.spigotConfig.nerfSpawnerMobs) {
entityinsentient.aware = false;
}
// Spigot End