mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-26 18:39:23 +00:00
3c25377465
ClassInstanceMultiMap belongs to Minecraft vanilla entity storage. And is unused, since replaced by spottedleaf's entity storage (rewrite chunk system). However these patches might be useful for vanilla entity storage if is used.
64 lines
2.9 KiB
Diff
64 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Taiyou06 <kaandindar21@gmail.com>
|
|
Date: Sat, 8 Feb 2025 05:32:30 +0100
|
|
Subject: [PATCH] Cache supporting block check
|
|
|
|
|
|
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
|
index 23b5695bf27663bbf1f2e3fd2010c0722ad425b0..fea6b829474e4fafbb9986a0c4fd73ae8fae1e09 100644
|
|
--- a/net/minecraft/world/entity/Entity.java
|
|
+++ b/net/minecraft/world/entity/Entity.java
|
|
@@ -1104,12 +1104,36 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
return this.mainSupportingBlockPos.isPresent() && this.mainSupportingBlockPos.get().equals(pos);
|
|
}
|
|
|
|
+ // Leaf start - Cache supporting block check
|
|
+ private boolean canSkipSupportingBlockSearch = false;
|
|
+ private BlockState cachedSupportingBlockState = null;
|
|
+ // Leaf end - Cache supporting block check
|
|
+
|
|
protected void checkSupportingBlock(boolean onGround, @Nullable Vec3 movement) {
|
|
+ // Leaf start - Cache supporting block check
|
|
+ // Skip full check if no movement and cache is valid
|
|
+ if (movement == null || (movement.x == 0 && movement.z == 0 && movement.y == 0)) {
|
|
+ if (canSkipSupportingBlockSearch) {
|
|
+ return;
|
|
+ }
|
|
+ } else {
|
|
+ // Invalidate cache on movement
|
|
+ canSkipSupportingBlockSearch = false;
|
|
+ cachedSupportingBlockState = null;
|
|
+ }
|
|
+ // Leaf end - Cache supporting block check
|
|
if (onGround) {
|
|
AABB boundingBox = this.getBoundingBox();
|
|
AABB aabb = new AABB(boundingBox.minX, boundingBox.minY - 1.0E-6, boundingBox.minZ, boundingBox.maxX, boundingBox.minY, boundingBox.maxZ);
|
|
Optional<BlockPos> optional = this.level.findSupportingBlock(this, aabb);
|
|
if (optional.isPresent() || this.onGroundNoBlocks) {
|
|
+ // Leaf start - Cache supporting block check
|
|
+ if (optional.isPresent()) { // Cache the block state if found
|
|
+ BlockPos pos = optional.get();
|
|
+ cachedSupportingBlockState = this.level.getBlockState(pos);
|
|
+ canSkipSupportingBlockSearch = true;
|
|
+ }
|
|
+ // Leaf end - Cache supporting block check
|
|
this.mainSupportingBlockPos = optional;
|
|
} else if (movement != null) {
|
|
AABB aabb1 = aabb.move(-movement.x, 0.0, -movement.z);
|
|
@@ -1126,6 +1150,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
}
|
|
}
|
|
|
|
+
|
|
+ // Leaf start - Cache supporting block check
|
|
+ // Helper method to get cached supporting block state
|
|
+ @Nullable
|
|
+ public BlockState getCachedSupportingBlock() {
|
|
+ return canSkipSupportingBlockSearch ? cachedSupportingBlockState : null;
|
|
+ }
|
|
+ // Leaf end - Cache supporting block check
|
|
+
|
|
public boolean onGround() {
|
|
return this.onGround;
|
|
}
|