From 6983322b9b6f97fe50bbe4e25ad5a439998d6bfc Mon Sep 17 00:00:00 2001 From: Glassmaker Date: Mon, 14 Jul 2014 13:12:11 +0300 Subject: [PATCH] Fixed accumulating fall damage in bounce pads, and step sound --- src/main/java/tconstruct/client/StepSoundSlime.java | 3 ++- src/main/java/tconstruct/world/blocks/SlimePad.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/client/StepSoundSlime.java b/src/main/java/tconstruct/client/StepSoundSlime.java index 4baf6bc2..4f8fd8ad 100644 --- a/src/main/java/tconstruct/client/StepSoundSlime.java +++ b/src/main/java/tconstruct/client/StepSoundSlime.java @@ -23,7 +23,8 @@ public class StepSoundSlime extends SoundType /** * Used when a entity walks over, or otherwise interacts with the block. */ - public String getStepSound () + @Override + public String getStepResourcePath() { return this.soundName + ".small"; } diff --git a/src/main/java/tconstruct/world/blocks/SlimePad.java b/src/main/java/tconstruct/world/blocks/SlimePad.java index a27723f5..30fcca82 100644 --- a/src/main/java/tconstruct/world/blocks/SlimePad.java +++ b/src/main/java/tconstruct/world/blocks/SlimePad.java @@ -80,6 +80,7 @@ public class SlimePad extends MantleBlock { entity.posY += 1; } + entity.fallDistance = 0.0F; entity.addVelocity(moveX, speed * 2, moveZ); world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, this.stepSound.getStepResourcePath(), (this.stepSound.getVolume()) / 2.0F, this.stepSound.getPitch() * 0.65F); }