Paper/Spigot-Server-Patches/0295-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch

79 lines
4.5 KiB
Diff
Raw Normal View History

From 73807d6a1e1c09a01de6f4c8320c9d33b8ad5bf1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 10 Sep 2018 23:56:36 -0400
Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
index bf8ca9b3..7ccb3d5c 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
@@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
2019-05-05 10:33:44 +02:00
private final Block g;
private final EntityInsentient entity;
2019-05-05 10:33:44 +02:00
private int i;
+ private World world; // Paper
public PathfinderGoalRemoveBlock(Block block, EntityCreature entitycreature, double d0, int i) {
super(entitycreature, d0, 24, i);
2019-05-05 10:33:44 +02:00
this.g = block;
this.entity = entitycreature;
+ this.world = entitycreature.world; // Paper
}
2019-05-05 10:33:44 +02:00
@Override
@@ -114,7 +116,9 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@Nullable
private BlockPosition a(BlockPosition blockposition, IBlockAccess iblockaccess) {
2019-05-05 10:33:44 +02:00
- if (iblockaccess.getType(blockposition).getBlock() == this.g) {
+ Block block = world.getBlockIfLoaded(blockposition); // Paper
+ if (block == null) return null; // Paper
2019-05-05 10:33:44 +02:00
+ if (block == this.g) { // Paper
return blockposition;
} else {
2019-05-28 01:01:45 +02:00
BlockPosition[] ablockposition = new BlockPosition[]{blockposition.down(), blockposition.west(), blockposition.east(), blockposition.north(), blockposition.south(), blockposition.down().down()};
2019-05-05 10:33:44 +02:00
@@ -124,7 +128,7 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
for (int j = 0; j < i; ++j) {
BlockPosition blockposition1 = ablockposition1[j];
2019-05-05 10:33:44 +02:00
- if (iblockaccess.getType(blockposition1).getBlock() == this.g) {
+ if (world.getBlockIfLoaded(blockposition1) == this.g) { // Paper
return blockposition1;
}
}
2019-07-20 06:01:24 +02:00
@@ -135,7 +139,7 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
2019-05-05 10:33:44 +02:00
@Override
protected boolean a(IWorldReader iworldreader, BlockPosition blockposition) {
2019-07-20 06:01:24 +02:00
- IChunkAccess ichunkaccess = iworldreader.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4, ChunkStatus.FULL, false);
+ IChunkAccess ichunkaccess = iworldreader.getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4); // Paper
2019-07-20 06:01:24 +02:00
return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).getBlock() == this.g && ichunkaccess.getType(blockposition.up()).isAir() && ichunkaccess.getType(blockposition.up(2)).isAir();
}
diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
index d4cd5091..d6a3b993 100644
--- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
+++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
@@ -109,6 +109,7 @@ public class RandomPositionGenerator {
}
blockposition2 = new BlockPosition((double) k1 + entitycreature.locX(), (double) l1 + entitycreature.locY(), (double) i2 + entitycreature.locZ());
+ if (!entitycreature.world.isLoaded(blockposition2)) continue; // Paper
if (blockposition2.getY() >= 0 && blockposition2.getY() <= entitycreature.world.getBuildHeight() && (!flag3 || entitycreature.a(blockposition2)) && (!flag2 || navigationabstract.a(blockposition2))) {
if (flag1) {
blockposition2 = a(blockposition2, random.nextInt(l + 1) + i1, entitycreature.world.getBuildHeight(), (blockposition3) -> {
@@ -116,7 +117,8 @@ public class RandomPositionGenerator {
});
}
- if (flag || !entitycreature.world.getFluid(blockposition2).a(TagsFluid.WATER)) {
+ Fluid fluid = entitycreature.world.getFluidIfLoaded(blockposition2); // Paper
+ if (flag || (fluid != null && !fluid.a(TagsFluid.WATER))) { // Paper
PathType pathtype = PathfinderNormal.b(entitycreature.world, blockposition2.getX(), blockposition2.getY(), blockposition2.getZ());
if (entitycreature.a(pathtype) == 0.0F) {
--
2.25.1.windows.1