From 5fc918bbf17f0c0553e2565ec60c434003601c95 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 13:55:27 -0400 Subject: [PATCH] include chunk gen mobs in natural counting, fix some spawn reasons --- .../0423-Entity-getEntitySpawnReason.patch | 47 +++++++++++++++++-- ...al-Spawned-mobs-towards-natural-spaw.patch | 14 ++++-- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch index 01bdd8a9d9..067ea74c18 100644 --- a/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0423-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From ec5ec4fe48cee79e40cd54657e888b273607e223 Mon Sep 17 00:00:00 2001 +From a186f2f777fab6c95fb2351c8c5cfa3937cf01fd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -9,8 +9,21 @@ Pre existing entities will return NATURAL if it was a non persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. +diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java +index 51df075b4..53ae5d509 100644 +--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java ++++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java +@@ -1131,7 +1131,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { + while (iterator.hasNext()) { + Entity entity1 = (Entity) iterator.next(); + +- a(entity1, generatoraccess); ++ a(entity1, generatoraccess, reason); // Paper + } + } + diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3c2e79b14f..0c58a4766a 100644 +index 3c2e79b14..0c58a4766 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -63,6 +63,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -58,8 +71,34 @@ index 3c2e79b14f..0c58a4766a 100644 // Paper end } catch (Throwable throwable) { +diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +index b2d2de7f8..af38e5396 100644 +--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java ++++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +@@ -117,7 +117,7 @@ public abstract class MobSpawnerAbstract { + } + } + // Paper end +- Entity entity = ChunkRegionLoader.a(nbttagcompound, world, d3, d4, d5, false); ++ Entity entity = ChunkRegionLoader.spawnEntity(nbttagcompound, world, d3, d4, d5, false, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // Paper + + if (entity == null) { + this.i(); +diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java +index b1630137e..df416e3b5 100644 +--- a/src/main/java/net/minecraft/server/PlayerList.java ++++ b/src/main/java/net/minecraft/server/PlayerList.java +@@ -196,7 +196,7 @@ public abstract class PlayerList { + + if (nbttagcompound != null && nbttagcompound.hasKeyOfType("RootVehicle", 10)) { + NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("RootVehicle"); +- Entity entity = ChunkRegionLoader.a(nbttagcompound1.getCompound("Entity"), worldserver, true); ++ Entity entity = ChunkRegionLoader.spawnEntity(nbttagcompound1.getCompound("Entity"), worldserver, true, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.MOUNT); // Paper + + if (entity != null) { + UUID uuid = nbttagcompound1.a("Attach"); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0624848ccd..9faed93039 100644 +index 0624848cc..9faed9303 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1084,6 +1084,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -71,7 +110,7 @@ index 0624848ccd..9faed93039 100644 return regionLimited.addEntity(entity, spawnReason); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index d4a8fb16b8..51f70c5eec 100644 +index d4a8fb16b..51f70c5ee 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -845,5 +845,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index 9475a3b938..71b7dae3dd 100644 --- a/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -1,4 +1,4 @@ -From c00cbd11cd310d1b03883c60261ced22e8ae6cae Mon Sep 17 00:00:00 2001 +From 01abbf425677bc6dbfe5159b84545fb3bbd1a036 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 01:01:32 -0400 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob @@ -17,7 +17,7 @@ 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 f259c4e514..fa1d88aa84 100644 +index f259c4e51..fa1d88aa8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -594,4 +594,14 @@ public class PaperWorldConfig { @@ -36,7 +36,7 @@ index f259c4e514..fa1d88aa84 100644 + } } diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java b/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java -index a10a5bc138..346176cf98 100644 +index a10a5bc13..a5a63f800 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldEntityList.java @@ -7,6 +7,7 @@ import net.minecraft.server.IAnimal; @@ -47,13 +47,17 @@ index a10a5bc138..346176cf98 100644 import java.util.ArrayList; import java.util.Collection; -@@ -90,7 +91,8 @@ public class PaperWorldEntityList extends ArrayList { +@@ -90,7 +91,12 @@ public class PaperWorldEntityList extends ArrayList { } public void updateEntityCount(Entity entity, int amt) { - if (!(entity instanceof IAnimal)) return; + // Only count natural spawns so that mob -+ if (!(entity instanceof IAnimal) || (entity.spawnReason != SpawnReason.NATURAL && !world.paperConfig.countAllMobsForSpawning)) return; ++ if (!(entity instanceof IAnimal) || ( ++ !world.paperConfig.countAllMobsForSpawning && ++ entity.spawnReason != SpawnReason.NATURAL && ++ entity.spawnReason != SpawnReason.CHUNK_GEN ++ )) return; if (entity instanceof EntityInsentient) { EntityInsentient entityinsentient = (EntityInsentient) entity;