papermc/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch

69 lines
2.6 KiB
Diff
Raw Normal View History

2017-04-22 06:16:45 +00:00
From dbcc226d6239952ce5b5db079ef633eada51a50d Mon Sep 17 00:00:00 2001
2016-02-29 23:09:49 +00: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 4fea4b359..1bb956515 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -214,4 +214,9 @@ public class PaperWorldConfig {
2016-02-29 23:09:49 +00: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 796b3e53f..ce1db632d 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
2016-12-20 22:34:27 +00:00
@@ -19,6 +19,7 @@ public abstract class MobSpawnerAbstract {
2016-02-29 23:09:49 +00:00
private int maxNearbyEntities = 6;
private int requiredPlayerRange = 16;
private int spawnRange = 4;
+ private int tickDelay = 0; // Paper
public MobSpawnerAbstract() {}
2016-12-20 22:34:27 +00:00
@@ -43,6 +44,10 @@ public abstract class MobSpawnerAbstract {
2016-02-29 23:09:49 +00: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.e = this.d;
} else {
2016-12-20 22:34:27 +00:00
@@ -56,18 +61,18 @@ public abstract class MobSpawnerAbstract {
2016-02-29 23:09:49 +00:00
this.a().addParticle(EnumParticle.SMOKE_NORMAL, d0, d1, d2, 0.0D, 0.0D, 0.0D, new int[0]);
this.a().addParticle(EnumParticle.FLAME, d0, d1, d2, 0.0D, 0.0D, 0.0D, new int[0]);
if (this.spawnDelay > 0) {
- --this.spawnDelay;
+ this.spawnDelay -= tickDelay; // Paper
}
this.e = this.d;
this.d = (this.d + (double) (1000.0F / ((float) this.spawnDelay + 200.0F))) % 360.0D;
} else {
- if (this.spawnDelay == -1) {
+ if (this.spawnDelay < -tickDelay) { // Paper
this.i();
}
if (this.spawnDelay > 0) {
- --this.spawnDelay;
+ this.spawnDelay -= tickDelay; // Paper
return;
}
--
2017-04-22 06:16:45 +00:00
2.12.2
2016-02-29 23:09:49 +00:00