Merge pull request #425 from Simplicitee/master

Fix fall damage animation
This commit is contained in:
OmniCypher 2016-02-26 15:56:27 -08:00
commit bb4485e4f7

View file

@ -827,6 +827,7 @@ public class PKListener implements Listener {
if (!event.isCancelled() && bPlayer.hasElement(Element.CHI) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.CHI)) { if (!event.isCancelled() && bPlayer.hasElement(Element.CHI) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.CHI)) {
if (player.isSprinting()) { if (player.isSprinting()) {
event.setDamage(0); event.setDamage(0);
event.setCancelled(true);
} else { } else {
double initdamage = event.getDamage(); double initdamage = event.getDamage();
double newdamage = event.getDamage() * ChiPassive.getFallReductionFactor(); double newdamage = event.getDamage() * ChiPassive.getFallReductionFactor();