geforkt von Mirrors/Paper
38428c0d6c
Remove utilities that are unused, as well as replacing the full chunk map with a concurrentutil implementation. Additionally, fix the addition/removal of chunks to/from the full chunk map so that getChunkIfLoaded correctly returns a non-null chunk when calling the load or unload events.
36 Zeilen
1.7 KiB
Diff
36 Zeilen
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 13 Nov 2021 12:36:26 -0800
|
|
Subject: [PATCH] Per world ticks per spawn settings
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
|
index 2f1acea765d1b6726863cdc89707ca6148548493..81bdb6e64e04641f741c2c3350236685b097ec7a 100644
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
|
@@ -186,6 +186,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
|
return this.getChunkIfLoaded(chunkX, chunkZ) != null;
|
|
}
|
|
// Paper end - Use getChunkIfLoadedImmediately
|
|
+ // Paper start - per world ticks per spawn
|
|
+ private int getTicksPerSpawn(SpawnCategory spawnCategory) {
|
|
+ final int perWorld = this.paperConfig().entities.spawning.ticksPerSpawn.getInt(CraftSpawnCategory.toNMS(spawnCategory));
|
|
+ if (perWorld >= 0) {
|
|
+ return perWorld;
|
|
+ }
|
|
+ return this.getCraftServer().getTicksPerSpawns(spawnCategory);
|
|
+ }
|
|
+ // Paper end
|
|
|
|
public abstract ResourceKey<LevelStem> getTypeKey();
|
|
|
|
@@ -198,7 +207,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
|
// CraftBukkit Ticks things
|
|
for (SpawnCategory spawnCategory : SpawnCategory.values()) {
|
|
if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
|
|
- this.ticksPerSpawnCategory.put(spawnCategory, (long) this.getCraftServer().getTicksPerSpawns(spawnCategory));
|
|
+ this.ticksPerSpawnCategory.put(spawnCategory, this.getTicksPerSpawn(spawnCategory)); // Paper
|
|
}
|
|
}
|
|
|