Prepare for 1.19 dev

2022-06-07 18:52:56 +02:00
parent f34f678b20
commit 1148687a8d
1302 changed files with 120 additions and 61 deletions
--- a/patches/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 24 Mar 2019 01:01:32 -0400
-Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
- limit
-
-This resolves the super common complaint about mobs not spawning.
-
-This was ultimately a flaw in the vanilla count algorithim that allows
-spawners and other misc mobs to count against the mob limit, which are
-not bounded, and can prevent the entire world from spawning new.
-
-I believe Bukkits changes around persistence may of actually made it
-worse than vanilla.
-
-This should fully solve all of the issues around it so that only natural
-influences natural spawns.
-
-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 preventMovingIntoUnloadedChunks() {
-         preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
-     }
-+
-+    public boolean countAllMobsForSpawning = false;
-+    private void countAllMobsForSpawning() {
-+        countAllMobsForSpawning = getBoolean("count-all-mobs-for-spawning", false);
-+        if (countAllMobsForSpawning) {
-+            log("Counting all mobs for spawning. Mob farms may reduce natural spawns elsewhere in world.");
-+        } else {
-+            log("Using improved mob spawn limits (Only Natural Spawns impact spawn limits for more natural spawns)");
-+        }
-+    }
- }
-+
-diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -0,0 +0,0 @@ public final class NaturalSpawner {
-             MobCategory enumcreaturetype = entity.getType().getCategory();
- 
-             if (enumcreaturetype != MobCategory.MISC) {
-+                // Paper start - Only count natural spawns
-+                if (!entity.level.paperConfig.countAllMobsForSpawning &&
-+                    !(entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL ||
-+                        entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
-+                    continue;
-+                }
-+                // Paper end
-                 BlockPos blockposition = entity.blockPosition();
- 
-                 chunkSource.query(ChunkPos.asLong(blockposition), (chunk) -> {