mirror of
https://github.com/BX-Team/DivineMC.git
synced 2026-01-04 15:31:43 +00:00
109c57a637
* start 1.21.6 update * change workflow * apply some patches * set experimental to true * some compile fixes * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@5d3463aa Updated Upstream (Paper) * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@5d3463aa Updated Upstream (Paper) * remove data converter for 1.21.6; move clumps to unapplied * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly * Update upstream * Update upstream * update to 1.21.6-pre4 * update patches * fix compile * set readme version to 1.21.6 * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@439f15db Updated Upstream (Paper) PurpurMC/Purpur@46a28b93 [ci/skip] update version in README
45 lines
2.2 KiB
Diff
45 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Wed, 11 Jun 2025 19:12:00 +0300
|
|
Subject: [PATCH] Reduce chunk loading & lookups
|
|
|
|
Original license: GPL v3
|
|
Original project: 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 fcdb3ee493e65bf002e78862f00061336e731ede..a8c11c6d7d107987dc04e5b741cfabf5ea0e8090 100644
|
|
--- a/net/minecraft/world/entity/monster/EnderMan.java
|
|
+++ b/net/minecraft/world/entity/monster/EnderMan.java
|
|
@@ -330,11 +330,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);
|
|
+ // DivineMC start - Reduce chunk loading & lookups
|
|
+ BlockState blockState;
|
|
+ if (org.bxteam.divinemc.config.DivineConfig.PerformanceCategory.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);
|
|
}
|
|
+ // DivineMC end - Reduce chunk loading & lookups
|
|
|
|
- BlockState blockState = this.level().getBlockState(mutableBlockPos);
|
|
boolean flag = blockState.blocksMotion();
|
|
boolean isWater = blockState.getFluidState().is(FluidTags.WATER);
|
|
if (flag && !isWater) {
|