Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-04 15:41:31 +00:00
Code Issues Releases Activity

Update 1.19.2

Browse Source 
fixed some bake bug left by 1.18.1
This commit is contained in:
violetc
2022-09-13 17:17:20 +08:00
parent 3384dee94d
commit 5c776b8a25
47 changed files with 330 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
patches/server/0044-Reduce-chunk-loading-lookups.patch Normal file
View File

@@ -0,0 +1,59 @@
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/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index f22e615dba31619c97bf58930da060476a52facf..c330e65310821248409655953b88717f634b0db5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -317,11 +317,28 @@ public class EnderMan extends Monster implements NeutralMob {
private boolean teleport(double x, double y, double z) {
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(x, y, z);
- while (blockposition_mutableblockposition.getY() > this.level.getMinBuildHeight() && !this.level.getBlockState(blockposition_mutableblockposition).getMaterial().blocksMotion()) {
- blockposition_mutableblockposition.move(Direction.DOWN);
+ // Leaves start - single chunk lookup
+ BlockState iblockdata;
+ if (top.leavesmc.leaves.LeavesConfig.reduceChuckLoadAndLookup) {
+ net.minecraft.world.level.chunk.LevelChunk chunk = this.level.getChunkIfLoaded(blockposition_mutableblockposition);
+ if (chunk == null) {
+ return false;
+ }
+
+ while (blockposition_mutableblockposition.getY() > this.level.getMinBuildHeight() && !chunk.getBlockState(blockposition_mutableblockposition).getMaterial().blocksMotion()) {
+ blockposition_mutableblockposition.move(Direction.DOWN);
+ }
+
+ iblockdata = chunk.getBlockState(blockposition_mutableblockposition);
+ } else {
+ while (blockposition_mutableblockposition.getY() > this.level.getMinBuildHeight() && !this.level.getBlockState(blockposition_mutableblockposition).getMaterial().blocksMotion()) {
+ blockposition_mutableblockposition.move(Direction.DOWN);
+ }
+
+ iblockdata = this.level.getBlockState(blockposition_mutableblockposition);
}
+ // Leaves end - single chunk lookup
- BlockState iblockdata = this.level.getBlockState(blockposition_mutableblockposition);
boolean flag = iblockdata.getMaterial().blocksMotion();
boolean flag1 = iblockdata.getFluidState().is(FluidTags.WATER);
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index bb4c4647bb98535b2e650eaefac50596a1107fb8..66bbc262a6b272eedd1fae2d0e33e31e8fbcf3bb 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -363,6 +363,11 @@ public final class LeavesConfig {
reduceEntityFluidLookup = getBoolean("settings.performance.reduce-entity-fluid-lookup", reduceEntityFluidLookup);
}
+ public static boolean reduceChuckLoadAndLookup = true;
+ private static void reduceChuckLoadAndLookup() {
+ reduceChuckLoadAndLookup = getBoolean("settings.performance.reduce-chuck-load-and-lookup", reduceChuckLoadAndLookup);
+ }
+
public static final class WorldConfig {
public final String worldName;