fix some annoying damage introductions from last commits change

This commit is contained in:
PhanaticD 2019-01-13 18:48:21 -05:00
parent da04657957
commit 88c1debab9
2 changed files with 6 additions and 1 deletions

View file

@ -380,6 +380,10 @@ public class PKListener implements Listener {
abil.remove();
}
if (CoreAbility.getAbility(player, FireJet.class) != null && event.getCause() == DamageCause.FLY_INTO_WALL) {
event.setCancelled(true);
}
if (bPlayer.isElementToggled(Element.FIRE)) {
return;
}

View file

@ -116,8 +116,9 @@ public class FireJet extends FireAbility {
@Override
public void remove() {
super.remove();
this.player.setGliding(false);
flightHandler.removeInstance(this.player, this.getName());
player.setGliding(false);
this.player.setFallDistance(0);
}
@Override