testserver/Spigot-Server-Patches/0039-Configurable-mob-spawn...

69 lines
2.7 KiB
Diff
Raw Normal View History

2018-01-24 17:31:43 +00:00
From 47726f319a2cf8df91cec25ceaaa7f0f2c436f16 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
2018-01-24 17:31:43 +00:00
index 49d14b8e9..1fd29332f 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
2018-01-11 05:31:19 +00:00
@@ -206,4 +206,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
2018-01-24 17:31:43 +00:00
index 0149726ea..a5261d70b 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 {
2018-01-24 17:31:43 +00:00
public int maxNearbyEntities = 6; // CraftBukkit private -> public
public int requiredPlayerRange = 16; // CraftBukkit private -> public
public int spawnRange = 4; // CraftBukkit private -> public
2016-02-29 23:09:49 +00:00
+ private int tickDelay = 0; // Paper
public MobSpawnerAbstract() {}
2017-08-09 18:44:28 +00:00
@@ -44,6 +45,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 {
2017-08-09 18:44:28 +00:00
@@ -57,18 +62,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;
}
--
2018-01-24 17:31:43 +00:00
2.16.1
2016-02-29 23:09:49 +00:00