mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-30 00:29:56 +02:00
41 lines
2.4 KiB
Diff
41 lines
2.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/world/entity/ai/goal/RemoveBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
|
||
|
index b255eed15cfc7282167a9bed01653b34bb8d13f1..ac5779319081a6894373877067edf958da8a9cf5 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/RemoveBlockGoal.java
|
||
|
@@ -133,7 +133,9 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
|
||
|
|
||
|
@Nullable
|
||
|
private BlockPos getPosWithBlock(BlockPos pos, BlockGetter world) {
|
||
|
- if (world.getBlockState(pos).is(this.blockToRemove)) {
|
||
|
+ net.minecraft.world.level.block.state.BlockState block = world.getTypeIfLoaded(pos); // Paper
|
||
|
+ if (block == null) return null; // Paper
|
||
|
+ if (block.is(this.blockToRemove)) { // Paper
|
||
|
return pos;
|
||
|
} else {
|
||
|
BlockPos[] ablockposition = new BlockPos[]{pos.below(), pos.west(), pos.east(), pos.north(), pos.south(), pos.below().below()};
|
||
|
@@ -143,7 +145,8 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
|
||
|
for (int j = 0; j < i; ++j) {
|
||
|
BlockPos blockposition1 = ablockposition1[j];
|
||
|
|
||
|
- if (world.getBlockState(blockposition1).is(this.blockToRemove)) {
|
||
|
+ net.minecraft.world.level.block.state.BlockState block2 = world.getTypeIfLoaded(blockposition1); // Paper
|
||
|
+ if (block2 != null && block2.is(this.blockToRemove)) { // Paper
|
||
|
return blockposition1;
|
||
|
}
|
||
|
}
|
||
|
@@ -154,7 +157,7 @@ public class RemoveBlockGoal extends MoveToBlockGoal {
|
||
|
|
||
|
@Override
|
||
|
protected boolean isValidTarget(LevelReader world, BlockPos pos) {
|
||
|
- ChunkAccess ichunkaccess = world.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ()), ChunkStatus.FULL, false);
|
||
|
+ ChunkAccess ichunkaccess = world.getChunkIfLoadedImmediately(pos.getX() >> 4, pos.getZ() >> 4); // Paper
|
||
|
|
||
|
return ichunkaccess == null ? false : ichunkaccess.getBlockState(pos).is(this.blockToRemove) && ichunkaccess.getBlockState(pos.above()).isAir() && ichunkaccess.getBlockState(pos.above(2)).isAir();
|
||
|
}
|