66 lines
2.7 KiB
Diff
66 lines
2.7 KiB
Diff
|
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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 2f7a5a4a5a7b29750cfd777e0bc5d19a14e93fa2..4de86b09c6bc3c1974ce61b550ccb73d37f6f170 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -176,4 +176,9 @@ public class PaperWorldConfig {
|
||
|
|
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/world/level/MobSpawnerAbstract.java b/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
|
||
|
|
index 8d8b03074df1635946f81bec0feae18d2f3e20aa..76c98d576d3e567ec4482b30219f5a9107cb9703 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/MobSpawnerAbstract.java
|
||
|
|
@@ -41,6 +41,7 @@ public abstract class MobSpawnerAbstract {
|
||
|
|
public int maxNearbyEntities = 6;
|
||
|
|
public int requiredPlayerRange = 16;
|
||
|
|
public int spawnRange = 4;
|
||
|
|
+ private int tickDelay = 0; // Paper
|
||
|
|
|
||
|
|
public MobSpawnerAbstract() {}
|
||
|
|
|
||
|
|
@@ -70,6 +71,10 @@ public abstract class MobSpawnerAbstract {
|
||
|
|
}
|
||
|
|
|
||
|
|
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;
|
||
|
|
} else {
|
||
|
|
@@ -84,18 +89,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);
|
||
|
|
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;
|
||
|
|
} else {
|
||
|
|
- if (this.spawnDelay == -1) {
|
||
|
|
+ if (this.spawnDelay < -tickDelay) { // Paper
|
||
|
|
this.i();
|
||
|
|
}
|
||
|
|
|
||
|
|
if (this.spawnDelay > 0) {
|
||
|
|
- --this.spawnDelay;
|
||
|
|
+ this.spawnDelay -= tickDelay; // Paper
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|