mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
90080d238e
--------- Co-authored-by: Lumine1909 <133463833+Lumine1909@users.noreply.github.com> Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> Co-authored-by: Helvetica Volubi <88063803+Suisuroru@users.noreply.github.com>
44 lines
2.2 KiB
Diff
44 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Sun, 21 Aug 2022 08:29:15 +0800
|
|
Subject: [PATCH] Reduce chunk loading & lookups
|
|
|
|
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
|
|
|
|
diff --git a/net/minecraft/world/entity/monster/EnderMan.java b/net/minecraft/world/entity/monster/EnderMan.java
|
|
index dcb49e8305aa8b9215da9f77fa147f701fdbbef0..0732709d0ca78f59ad6b7f8ac5e7bfbe5506f60b 100644
|
|
--- a/net/minecraft/world/entity/monster/EnderMan.java
|
|
+++ b/net/minecraft/world/entity/monster/EnderMan.java
|
|
@@ -302,11 +302,28 @@ 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()) {
|
|
- mutableBlockPos.move(Direction.DOWN);
|
|
+ // Leaves start - single chunk lookup
|
|
+ BlockState blockState;
|
|
+ if (org.leavesmc.leaves.LeavesConfig.performance.reduceChuckLoadAndLookup) {
|
|
+ net.minecraft.world.level.chunk.LevelChunk chunk = this.level().getChunkIfLoaded(mutableBlockPos);
|
|
+ if (chunk == null) {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ while (mutableBlockPos.getY() > this.level().getMinY() && !chunk.getBlockState(mutableBlockPos).blocksMotion()) {
|
|
+ mutableBlockPos.move(Direction.DOWN);
|
|
+ }
|
|
+
|
|
+ blockState = chunk.getBlockState(mutableBlockPos);
|
|
+ } else {
|
|
+ while (mutableBlockPos.getY() > this.level().getMinY() && !this.level().getBlockState(mutableBlockPos).blocksMotion()) {
|
|
+ mutableBlockPos.move(Direction.DOWN);
|
|
+ }
|
|
+
|
|
+ blockState = this.level().getBlockState(mutableBlockPos);
|
|
}
|
|
+ // Leaves end - single chunk lookup
|
|
|
|
- BlockState blockState = this.level().getBlockState(mutableBlockPos);
|
|
boolean flag = blockState.blocksMotion();
|
|
boolean isWater = blockState.getFluidState().is(FluidTags.WATER);
|
|
if (flag && !isWater) {
|