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

36 lines
2.1 KiB
Diff
Raw Normal View History

Fix a case where mob spawning could load/gen chunks
2019-03-24 04:59:45 +00:00
From 486bdf075eb79ddb255338c537871df4d7a2742a 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
Fix a case where mob spawning could load/gen chunks
2019-03-24 04:59:45 +00:00
index bfbe4d3e39..17bb81c03e 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;
Fix a case where mob spawning could load/gen chunks
2019-03-24 04:59:45 +00:00
@@ -158,7 +158,7 @@ public final class SpawnerCreature {
float f1 = (float) l3 + 0.5F;
EntityHuman entityhuman1 = worldserver.a((double) f, (double) f1, -1.0D);
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
Fix a case where mob spawning could load/gen chunks
2019-03-24 04:59:45 +00:00
- if (entityhuman1 != null) {
+ if (entityhuman1 != null && worldserver.isLoadedAndInBounds(blockposition_mutableblockposition)) { // Paper - don't load chunks for mob spawn
double d0 = entityhuman1.d((double) f, (double) k3, (double) f1);
if (d0 > 576.0D && blockposition.distanceSquared((double) f, (double) k3, (double) f1) >= 576.0D) {
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 00:28:15 +00:00
2.21.0
Prevent mob spawning from loading chunks
2018-09-13 01:18:31 +00:00