Skip to content

fix collision shape cache #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dreeam-qwq merged 9 commits into from
Jan 7, 2026
Merged

fix collision shape cache #512

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7ee3dce
fix collision shape cache
hayanesuru Sep 22, 2025
8ce2f41
Merge branch 'main' into fix-collision-shape-cache
hayanesuru Oct 6, 2025
3671269
rebuild patches
hayanesuru Oct 6, 2025
3474507
Revert "rebuild patches"
hayanesuru Oct 21, 2025
39fef0a
Merge branch 'main' into fix-collision-shape-cache
hayanesuru Oct 21, 2025
083f153
rebuild patches
hayanesuru Oct 21, 2025
507d37d
Merge branch 'main' into fix-collision-shape-cache [ci skip]
hayanesuru Nov 3, 2025
ae37e59
Merge branch 'main' into fix-collision-shape-cache
hayanesuru Jan 5, 2026
9a620c3
add water
hayanesuru Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions leaf-server/minecraft-patches/features/0293-optimize-collision-shape.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,22 @@ Subject: [PATCH] optimize collision shape


diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
index 503420bbeaf3da0c568c28c55582f45469f40aeb..20fb2439c11f24790f58fe9d9caa100b398308a0 100644
index 503420bbeaf3da0c568c28c55582f45469f40aeb..e186b435e7a25ba4c5a203a8748b1531dbf7b1b8 100644
--- a/net/minecraft/world/level/block/state/BlockBehaviour.java
+++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
@@ -619,6 +619,13 @@ public abstract class BlockBehaviour implements FeatureElement {
@@ -619,6 +619,18 @@ public abstract class BlockBehaviour implements FeatureElement {
this.emptyConstantCollisionShape = this.constantCollisionShape != null && this.constantCollisionShape.isEmpty();
// init caches
initCaches(collisionShape, true);
+ // Leaf start - optimize collision shape
+ switch (getBlock()) {
+ case net.minecraft.world.level.block.FireBlock fireBlock -> {}
+ case net.minecraft.world.level.block.LiquidBlock liquidBlock -> {}
+ case net.minecraft.world.level.block.LiquidBlock ignore -> {
+ if (getFluidState().is(Fluids.WATER)) {
+ this.constantCollisionShape = collisionShape;
+ }
+ }
+ case net.minecraft.world.level.block.ScaffoldingBlock ignore -> {}
+ case net.minecraft.world.level.block.PowderSnowBlock ignore -> {}
+ default -> this.constantCollisionShape = collisionShape;
+ }
+ // Leaf end - optimize collision shape
Expand Down