From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 12 Jan 2025 12:27:17 +0800 Subject: [PATCH] Pufferfish: Reduce chunk loading & lookups Co-authored by: Paul Sauve As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/patches/server/0014-Reduce-chunk-loading-lookups.patch) Licensed under: GPL-3.0 (https://github.com/pufferfish-gg/Pufferfish/blob/04bc249f9eee6157338b6884113b6fa3192bf59b/PATCH-LICENSE) diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java index 4edd94ac765d2ab107612504b67e6e07da609313..c0e38131da55d8a85444ef4248224d37a7271089 100644 --- a/net/minecraft/world/entity/monster/EnderMan.java +++ b/net/minecraft/world/entity/monster/EnderMan.java @@ -296,11 +296,18 @@ public class EnderMan extends Monster implements NeutralMob { private boolean teleport(double x, double y, double z) { BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos(x, y, z); - while (mutableBlockPos.getY() > this.level().getMinY() && !this.level().getBlockState(mutableBlockPos).blocksMotion()) { + // Pufferfish start - single chunk lookup + net.minecraft.world.level.chunk.LevelChunk chunk = this.level().getChunkIfLoaded(mutableBlockPos); + if (chunk == null) { + return false; + } + // Pufferfish end + while (mutableBlockPos.getY() > this.level().getMinY() && !chunk.getBlockState(mutableBlockPos).blocksMotion()) { // Pufferfish + mutableBlockPos.move(Direction.DOWN); } - BlockState blockState = this.level().getBlockState(mutableBlockPos); + BlockState blockState = chunk.getBlockState(mutableBlockPos); // Pufferfish boolean flag = blockState.blocksMotion(); boolean isWater = blockState.getFluidState().is(FluidTags.WATER); if (flag && !isWater) {