mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-04 10:11:29 +01:00
4bead5b898
Use -1 to represent vanilla/unlimited. Updated PaperWorldConfig to also update the individual worlds limit if it was set to the new default value. Should hopefully help #235
50 lines
No EOL
2.8 KiB
Diff
50 lines
No EOL
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 15 Apr 2016 21:27:14 -0400
|
|
Subject: [PATCH] Allow capping number of attempts at spawning mobs
|
|
|
|
By default, this logic would loop endlessly trying to fill the world
|
|
with entities until it hits the worlds spawn.
|
|
|
|
This patch will cap the # of attempts to so that the tick does not spend
|
|
extra long time on mob spawning
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
|
|
private void useVanillaScoreboardColoring() {
|
|
useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
|
|
}
|
|
+
|
|
+ public int maxMobSpawnAttempts;
|
|
+ private void maxMobSpawnAttempts() {
|
|
+ maxMobSpawnAttempts = getInt("max-mob-spawn-attempts", 250);
|
|
+ log( "Max Mob Spawn Attempts: " + maxMobSpawnAttempts);
|
|
+ if (maxMobSpawnAttempts < 0) {
|
|
+ maxMobSpawnAttempts = Integer.MAX_VALUE;
|
|
+ } else {
|
|
+ if (maxMobSpawnAttempts < 250 && PaperConfig.version < 10) {
|
|
+ set("max-mob-spawn-attempts", 250);
|
|
+ maxMobSpawnAttempts = 250;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
|
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
|
@@ -0,0 +0,0 @@ public final class SpawnerCreature {
|
|
Iterator iterator1 = this.b.iterator();
|
|
|
|
int moblimit = (limit * i / 256) - mobcnt + 1; // Spigot - up to 1 more than limit
|
|
+ int maxMobSpawnAttempts = worldserver.paperConfig.maxMobSpawnAttempts; // Paper - max attempts
|
|
label120:
|
|
- while (iterator1.hasNext() && (moblimit > 0)) { // Spigot - while more allowed
|
|
+ while (iterator1.hasNext() && (moblimit > 0) && maxMobSpawnAttempts-- > 0) { // Spigot - while more allowed // Paper - max attempts
|
|
// CraftBukkit start = use LongHash and LongObjectHashMap
|
|
long key = ((Long) iterator1.next()).longValue();
|
|
BlockPosition blockposition1 = getRandomPosition(worldserver, LongHash.msw(key), LongHash.lsw(key));
|
|
--
|