aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0247-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0247-Prevent-mob-spawning-from-loading-generating-chunks.patch')
-rw-r--r--patches/server/0247-Prevent-mob-spawning-from-loading-generating-chunks.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/server/0247-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0247-Prevent-mob-spawning-from-loading-generating-chunks.patch
new file mode 100644
index 0000000000..1ca48ef5a8
--- /dev/null
+++ b/patches/server/0247-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Wed, 12 Sep 2018 21:12:57 -0400
+Subject: [PATCH] Prevent mob spawning from loading/generating chunks
+
+also prevents if out of world border bounds
+
+diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+index bce78beaadbfd0e400457bd14bcf6538be702879..41eef8bfd1572aecaf086bfbec300abeae2df794 100644
+--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
++++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+@@ -165,9 +165,9 @@ public final class NaturalSpawner {
+ StructureManager structuremanager = world.structureManager();
+ ChunkGenerator chunkgenerator = world.getChunkSource().getGenerator();
+ int i = pos.getY();
+- BlockState iblockdata = chunk.getBlockState(pos);
++ BlockState iblockdata = world.getBlockStateIfLoadedAndInBounds(pos); // Paper - don't load chunks for mob spawn
+
+- if (!iblockdata.isRedstoneConductor(chunk, pos)) {
++ if (iblockdata != null && !iblockdata.isRedstoneConductor(chunk, pos)) { // Paper - don't load chunks for mob spawn
+ BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
+ int j = 0;
+ int k = 0;
+@@ -196,7 +196,7 @@ public final class NaturalSpawner {
+ if (entityhuman != null) {
+ double d2 = entityhuman.distanceToSqr(d0, (double) i, d1);
+
+- if (NaturalSpawner.isRightDistanceToPlayerAndSpawnPoint(world, chunk, blockposition_mutableblockposition, d2)) {
++ if (world.isLoadedAndInBounds(blockposition_mutableblockposition) && NaturalSpawner.isRightDistanceToPlayerAndSpawnPoint(world, chunk, blockposition_mutableblockposition, d2)) { // Paper - don't load chunks for mob spawn
+ if (biomesettingsmobs_c == null) {
+ Optional<MobSpawnSettings.SpawnerData> optional = NaturalSpawner.getRandomSpawnMobAt(world, structuremanager, chunkgenerator, group, world.random, blockposition_mutableblockposition);
+