core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0369-Prevent-mob-spawning-f...

36 lines
2.4 KiB
Diff
Raw Normal View History

Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
From 19c62991e8d96fd05203ccb3b23d8570ce4eca0b Mon Sep 17 00:00:00 2001
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
From: Aikar <aikar@aikar.co>
Date: Wed, 12 Sep 2018 21:12:57 -0400
Subject: [PATCH] Prevent mob spawning from loading/generating chunks
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
also prevents if out of world border bounds
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
index 387570ed67..fb57cb8394 100644
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
Fix loop risk in mob spawning around unloaded chunks When a mob was about to load a chunk to try to spawn in, we did not increment the attempt counter, resulting in it being stuck in the mob spawn loop for a long time and hanging servers.
2018-09-15 17:46:01 +00:00
@@ -129,9 +129,9 @@ public final class SpawnerCreature {
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
int i2 = blockposition1.getX();
int j2 = blockposition1.getY();
int k2 = blockposition1.getZ();
- IBlockData iblockdata = worldserver.getType(blockposition1);
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
+ IBlockData iblockdata = worldserver.getTypeIfLoadedAndInBounds(blockposition1); // Paper - don't load chunks for mob spawn
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
Fix loop risk in mob spawning around unloaded chunks When a mob was about to load a chunk to try to spawn in, we did not increment the attempt counter, resulting in it being stuck in the mob spawn loop for a long time and hanging servers.
2018-09-15 17:46:01 +00:00
- if (!iblockdata.isOccluding()) {
+ if (iblockdata != null && !iblockdata.isOccluding()) { // Paper - don't load chunks for mob spawn
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
int l2 = 0;
Fix loop risk in mob spawning around unloaded chunks When a mob was about to load a chunk to try to spawn in, we did not increment the attempt counter, resulting in it being stuck in the mob spawn loop for a long time and hanging servers.
2018-09-15 17:46:01 +00:00
int i3 = 0;
@@ -167,7 +167,7 @@ public final class SpawnerCreature {
i4 = biomebase_biomemeta.c + worldserver.random.nextInt(1 + biomebase_biomemeta.d - biomebase_biomemeta.c);
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
}
Fix loop risk in mob spawning around unloaded chunks When a mob was about to load a chunk to try to spawn in, we did not increment the attempt counter, resulting in it being stuck in the mob spawn loop for a long time and hanging servers.
2018-09-15 17:46:01 +00:00
- if (worldserver.a(enumcreaturetype, biomebase_biomemeta, (BlockPosition) blockposition_mutableblockposition)) {
Ensure mobs don't spawn out of world border this is originally what I thought #1333 was, but wasn't, but this is still valid fix
2018-09-18 01:50:02 +00:00
+ if (worldserver.isLoadedAndInBounds(blockposition_mutableblockposition) && worldserver.a(enumcreaturetype, biomebase_biomemeta, (BlockPosition) blockposition_mutableblockposition)) { // Paper - don't load chunks for mob spawn
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
EntityPositionTypes.Surface entitypositiontypes_surface = EntityPositionTypes.a(biomebase_biomemeta.b);
if (entitypositiontypes_surface != null && a(entitypositiontypes_surface, worldserver, blockposition_mutableblockposition, biomebase_biomemeta.b)) {
EntityInsentient entityinsentient;
--
Fix loop risk in mob spawning around unloaded chunks When a mob was about to load a chunk to try to spawn in, we did not increment the attempt counter, resulting in it being stuck in the mob spawn loop for a long time and hanging servers.
2018-09-15 17:46:01 +00:00
2.19.0
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00