Fixed accumulating fall damage in bounce pads, and step sound

SlimeKnights · Jul 14, 2014 · 6983322 · 6983322
1 parent 852e31c
commit 6983322
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/tconstruct/client/StepSoundSlime.java b/src/main/java/tconstruct/client/StepSoundSlime.java
@@ -23,7 +23,8 @@ public String getBreakSound ()
     /**
      * 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
@@ -80,6 +80,7 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity
             {
                 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);
         }