TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-08-17 08:57:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #424 from Simplicitee/master

Browse source 
Fix shockwave and other
This commit is contained in:
OmniCypher 2016-02-25 15:24:47 -08:00
parent 3cddb44b57 5d244d0eac
commit 280de9fca4
2 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -799,26 +799,19 @@ public class PKListener implements Listener {
if (bPlayer == null) {
return;
}
if (bPlayer.hasElement(Element.EARTH) && event.getCause() == DamageCause.FALL) {
Shockwave shockwave = new Shockwave(player);
shockwave.fallShockwave();
new Shockwave(player, true);
}
if (bPlayer.hasElement(Element.AIR) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.AIR)) {
new Flight(player);
player.setAllowFlight(true);
if (!event.isCancelled() && bPlayer.hasElement(Element.AIR) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.AIR)) {
new AirBurst(player, true);
player.setFallDistance(0);
event.setDamage(0D);
event.setCancelled(true);
}
if (!event.isCancelled() && bPlayer.hasElement(Element.WATER) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.WATER)) {
if (WaterPassive.applyNoFall(player)) {
new Flight(player);
player.setAllowFlight(true);
player.setFallDistance(0);
event.setDamage(0D);
event.setCancelled(true);
}
@ -826,9 +819,6 @@ public class PKListener implements Listener {
if (!event.isCancelled() && bPlayer.hasElement(Element.EARTH) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.EARTH)) {
if (EarthPassive.softenLanding(player)) {
new Flight(player);
player.setAllowFlight(true);
player.setFallDistance(0);
event.setDamage(0D);
event.setCancelled(true);
}
@ -837,7 +827,6 @@ public class PKListener implements Listener {
if (!event.isCancelled() && bPlayer.hasElement(Element.CHI) && event.getCause() == DamageCause.FALL && bPlayer.canBendPassive(Element.CHI)) {
if (player.isSprinting()) {
event.setDamage(0);
event.setCancelled(true);
} else {
double initdamage = event.getDamage();
double newdamage = event.getDamage() * ChiPassive.getFallReductionFactor();
@ -1369,7 +1358,7 @@ public class PKListener implements Listener {
new CollapseWall(player);
}
if (abil.equalsIgnoreCase("Shockwave")) {
new Shockwave(player);
new Shockwave(player, false);
}
if (abil.equalsIgnoreCase("EarthGrab")) {
new EarthGrab(player, false);

14
src/com/projectkorra/projectkorra/earthbending/Shockwave.java
View file

@ -17,7 +17,7 @@ public class Shockwave extends EarthAbility {
private double threshold;
private double range;
public Shockwave(Player player) {
public Shockwave(Player player, boolean fall) {
super(player);
this.angle = Math.toRadians(getConfig().getDouble("Abilities.Earth.Shockwave.Angle"));
@ -35,20 +35,24 @@ public class Shockwave extends EarthAbility {
return;
}
if (fall) {
fallShockwave();
}
start();
bPlayer.addCooldown(this);
}
public void fallShockwave() {
if (!bPlayer.canBendIgnoreCooldowns(this)) {
return;
} else if (player.getFallDistance() < threshold || !isEarthbendable(player.getLocation().add(0, -1, 0).getBlock())) {
} else if (player.getFallDistance() < threshold || !isEarthbendable(player.getLocation().clone().subtract(0, 1, 0).getBlock())) {
return;
} else if(bPlayer.isOnCooldown("Shockwave")) {
} else if (bPlayer.isOnCooldown("Shockwave")) {
return;
}
areaShockwave();
bPlayer.addCooldown(this);
remove();
}