testserver/patches/server/0042-Configurable-mob-spawn...

50 lines
2.2 KiB
Diff
Raw Normal View History

2021-06-12 00:57:04 +00: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
index c5b9b19763fd944b4f31c6d3c9b71d372f8403cf..e5b56a85d76d1417dda2d14b1b03850bbb070f4c 100644
2021-06-12 00:57:04 +00:00
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
2021-11-23 12:15:10 +00:00
@@ -42,6 +42,7 @@ public abstract class BaseSpawner {
2022-06-07 19:15:06 +00:00
public int maxNearbyEntities = 6;
2021-11-23 12:15:10 +00:00
public int requiredPlayerRange = 16;
public int spawnRange = 4;
2021-06-12 00:57:04 +00:00
+ private int tickDelay = 0; // Paper
2021-11-23 12:15:10 +00:00
public BaseSpawner() {}
2022-06-07 19:15:06 +00:00
@@ -76,13 +77,18 @@ public abstract class BaseSpawner {
2021-06-12 00:57:04 +00: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 00:57:04 +00: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-06-07 19:15:06 +00:00
@@ -148,8 +154,7 @@ public abstract class BaseSpawner {
2021-06-12 00:57:04 +00: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