Fixed passable leaves not slowing down fall

DynamicTreesTeam · Dec 10, 2024 · a15d0b0 · a15d0b0
1 parent 5cfa443
commit a15d0b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/ferreusveritas/dynamictrees/block/leaves/DynamicLeavesBlock.java b/src/main/java/com/ferreusveritas/dynamictrees/block/leaves/DynamicLeavesBlock.java
@@ -364,7 +364,7 @@ public void entityInside(BlockState state, Level level, BlockPos pos, Entity ent
         if (isMovementVanilla() || isEntityPassable(entity)) {
             super.entityInside(state, level, pos, entity);
         } else {
-            if (entity.getDeltaMovement().y < 0.0D && entity.fallDistance < 2.0f) {
+            if (entity.getDeltaMovement().y < 0.0D && (isLeavesPassable() || entity.fallDistance < 2.0f)) {
                 entity.fallDistance = 0.0f;
                 entity.setDeltaMovement(entity.getDeltaMovement().x, entity.getDeltaMovement().y * 0.5D, entity.getDeltaMovement().z); // Slowly sink into the block
             } else if (!isLeavesPassable() && entity.getDeltaMovement().y > 0 && entity.getDeltaMovement().y < 0.25D) {

diff --git a/src/main/java/com/ferreusveritas/dynamictrees/init/DTConfigs.java b/src/main/java/com/ferreusveritas/dynamictrees/init/DTConfigs.java
@@ -131,7 +131,7 @@ public class DTConfigs {
         SERVER_BUILDER.pop();
 
         SERVER_BUILDER.comment("Interaction Settings").push("interaction");
-        IS_LEAVES_PASSABLE = SERVER_BUILDER.comment("If enabled all leaves will be passable").
+        IS_LEAVES_PASSABLE = SERVER_BUILDER.comment("If enabled all leaves will be passable. If the Passable Foliage mod is installed this config is overridden").
                 define("isLeavesPassable", false);
         VANILLA_LEAVES_COLLISION = SERVER_BUILDER.comment("If enabled player movement on leaves will not be enhanced").
                 define("vanillaLeavesCollision", false);