Merge pull request #15 from fonnymunkey/release/1.12.2

Fix #14 and add tree collision volume scaling with repeated collisions
TerraFirmaCraft-The-Final-Frontier · Jun 19, 2024 · c8738ee · c8738ee
2 parents d754d9d + 5f142b0
commit c8738ee
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/...ain/java/com/ferreusveritas/dynamictrees/entities/animation/AnimationHandlerFallover.java b/...ain/java/com/ferreusveritas/dynamictrees/entities/animation/AnimationHandlerFallover.java
@@ -34,8 +34,6 @@
 
 public class AnimationHandlerFallover implements IAnimationHandler {
 
-	boolean fallSound = false;
-
 	@Override
 	public String getName() {
 		return "fallover";
@@ -110,14 +108,12 @@ public void handleMotion(EntityFallingTree entity) {
 		}
 
 		if (fallSpeed > 0 && testCollision(entity)) {
+			float fallSpeedPrev = fallSpeed;
 			addRotation(entity, -fallSpeed);//pull back to before the collision
 			getData(entity).bounces++;
 			fallSpeed *= -AnimationConstants.TREE_ELASTICITY;//bounce with elasticity
 			entity.landed = Math.abs(fallSpeed) < 0.02f;//The entity has landed if after a bounce it has little velocity
-			if (!fallSound) {
-				entity.world.playSound(null, entity.getPosition(), ModSoundEvents.TREE_LANDING, SoundCategory.AMBIENT, 0.8F, entity.world.rand.nextFloat());
-				fallSound = true;
-			}
+			if(fallSpeedPrev > 0.1F && !entity.world.isRemote) entity.world.playSound(null, entity.getPosition(), ModSoundEvents.TREE_LANDING, SoundCategory.AMBIENT, (Math.min(1.5F, fallSpeedPrev) / 1.5F) * 0.6F + 0.1F, entity.world.rand.nextFloat() * 0.2F + 0.6F);
 		}
 
 		//Crush living things with clumsy dead trees