mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-18 08:36:13 +01:00
33 lines
2.3 KiB
Diff
33 lines
2.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
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/SpawnerCreature.java b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
|
||
|
|
index 1969d1002b3182338614a2be0519fcdc385b7a44..5307488fa48ffa91446dd4457de1ce6a8f61da61 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/SpawnerCreature.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/SpawnerCreature.java
|
||
|
|
@@ -176,9 +176,9 @@ public final class SpawnerCreature {
|
||
|
|
StructureManager structuremanager = worldserver.getStructureManager();
|
||
|
|
ChunkGenerator chunkgenerator = worldserver.getChunkProvider().getChunkGenerator();
|
||
|
|
int i = blockposition.getY();
|
||
|
|
- IBlockData iblockdata = ichunkaccess.getType(blockposition);
|
||
|
|
+ IBlockData iblockdata = worldserver.getTypeIfLoadedAndInBounds(blockposition); // Paper - don't load chunks for mob spawn
|
||
|
|
|
||
|
|
- if (!iblockdata.isOccluding(ichunkaccess, blockposition)) {
|
||
|
|
+ if (iblockdata != null && !iblockdata.isOccluding(ichunkaccess, blockposition)) { // Paper - don't load chunks for mob spawn
|
||
|
|
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
|
||
|
|
int j = 0;
|
||
|
|
int k = 0;
|
||
|
|
@@ -207,7 +207,7 @@ public final class SpawnerCreature {
|
||
|
|
if (entityhuman != null) {
|
||
|
|
double d2 = entityhuman.h(d0, (double) i, d1);
|
||
|
|
|
||
|
|
- if (a(worldserver, ichunkaccess, blockposition_mutableblockposition, d2)) {
|
||
|
|
+ if (a(worldserver, ichunkaccess, blockposition_mutableblockposition, d2) && worldserver.isLoadedAndInBounds(blockposition_mutableblockposition)) { // Paper - don't load chunks for mob spawn
|
||
|
|
if (biomesettingsmobs_c == null) {
|
||
|
|
biomesettingsmobs_c = a(worldserver, structuremanager, chunkgenerator, enumcreaturetype, worldserver.random, (BlockPosition) blockposition_mutableblockposition);
|
||
|
|
if (biomesettingsmobs_c == null) {
|