Paper/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch

69 lines
2.6 KiB
Diff
Raw Normal View History

From 95dbe985906096bdaf6410889068bbb80099cbf5 Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01:00
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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 8db5c3f3fe..e4e00e2e1c 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2019-04-25 08:53:51 +02:00
@@ -166,4 +166,9 @@ public class PaperWorldConfig {
2016-03-01 00:09:49 +01:00
private void disableIceAndSnow(){
disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
}
+
+ public int mobSpawnerTickRate;
+ private void mobSpawnerTickRate() {
+ mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
+ }
}
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index a2140cb6c5..b3af4ba233 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
2019-04-25 08:53:51 +02:00
@@ -23,6 +23,7 @@ public abstract class MobSpawnerAbstract {
public int maxNearbyEntities = 6;
public int requiredPlayerRange = 16;
public int spawnRange = 4;
2016-03-01 00:09:49 +01:00
+ private int tickDelay = 0; // Paper
public MobSpawnerAbstract() {}
2019-04-25 08:53:51 +02:00
@@ -52,6 +53,10 @@ public abstract class MobSpawnerAbstract {
2016-03-01 00:09:49 +01:00
}
public void c() {
+ // Paper start - Configurable mob spawner tick rate
+ if (spawnDelay > 0 && --tickDelay > 0) return;
+ tickDelay = this.a().paperConfig.mobSpawnerTickRate;
+ // Paper end
if (!this.h()) {
this.f = this.e;
2016-03-01 00:09:49 +01:00
} else {
2019-04-25 08:53:51 +02:00
@@ -66,18 +71,18 @@ public abstract class MobSpawnerAbstract {
world.addParticle(Particles.SMOKE, d0, d1, d2, 0.0D, 0.0D, 0.0D);
world.addParticle(Particles.FLAME, d0, d1, d2, 0.0D, 0.0D, 0.0D);
2016-03-01 00:09:49 +01:00
if (this.spawnDelay > 0) {
- --this.spawnDelay;
+ this.spawnDelay -= tickDelay; // Paper
}
this.f = this.e;
this.e = (this.e + (double) (1000.0F / ((float) this.spawnDelay + 200.0F))) % 360.0D;
2016-03-01 00:09:49 +01:00
} else {
- if (this.spawnDelay == -1) {
+ if (this.spawnDelay < -tickDelay) { // Paper
this.i();
}
if (this.spawnDelay > 0) {
- --this.spawnDelay;
+ this.spawnDelay -= tickDelay; // Paper
return;
}
--
2.21.0
2016-03-01 00:09:49 +01:00