TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-11-01 09:59:18 +00:00
Code Issues Projects Releases Wiki Activity

fix some annoying damage introductions from last commits change

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/projectkorra/projectkorra/PKListener.java
View file

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

3
src/com/projectkorra/projectkorra/firebending/FireJet.java
View file

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