TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #411 from Simplicitee/master

Browse source 
Various changes
This commit is contained in:
OmniCypher 2016-02-18 21:38:16 -08:00
commit de454ac88d
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/airbending/AirSwipe.java
View file

@ -84,7 +84,6 @@ public class AirSwipe extends AirAbility {
launch(); launch();
} }
start(); start();
bPlayer.addCooldown(this);
} }
public static boolean removeSwipesAroundPoint(Location loc, double radius) { public static boolean removeSwipesAroundPoint(Location loc, double radius) {
@ -228,6 +227,7 @@ public class AirSwipe extends AirAbility {
} }
private void launch() { private void launch() {
bPlayer.addCooldown("AirSwipe", cooldown);
origin = player.getEyeLocation(); origin = player.getEyeLocation();
for (double i = -arc; i <= arc; i += stepSize) { for (double i = -arc; i <= arc; i += stepSize) {
double angle = Math.toRadians((double) i); double angle = Math.toRadians((double) i);

2
src/com/projectkorra/projectkorra/firebending/FireCombo.java
View file

@ -195,12 +195,14 @@ public class FireCombo extends FireAbility implements ComboAbility {
affectedEntities.add(entity); affectedEntities.add(entity);
GeneralMethods.damageEntity(this, entity, damage); GeneralMethods.damageEntity(this, entity, damage);
entity.setFireTicks((int) (fireTicks * 20)); entity.setFireTicks((int) (fireTicks * 20));
new FireDamageTimer(entity, player);
} }
} else if (ability.equalsIgnoreCase("FireWheel")) { } else if (ability.equalsIgnoreCase("FireWheel")) {
if (!affectedEntities.contains(entity)) { if (!affectedEntities.contains(entity)) {
affectedEntities.add(entity); affectedEntities.add(entity);
GeneralMethods.damageEntity(this, entity, damage); GeneralMethods.damageEntity(this, entity, damage);
entity.setFireTicks((int) (fireTicks * 20)); entity.setFireTicks((int) (fireTicks * 20));
new FireDamageTimer(entity, player);
this.remove(); this.remove();
} }
} }

3
src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
View file

@ -258,7 +258,8 @@ public class WaterSpout extends WaterAbility {
for (WaterSpout spout : getAbilities(sourcePlayer, WaterSpout.class)) { for (WaterSpout spout : getAbilities(sourcePlayer, WaterSpout.class)) {
Location top = spout.getLocation(); Location top = spout.getLocation();
Location base = spout.getBase().getLocation(); Location base = spout.getBase().getLocation();
for (double d = base.getY(); d <= top.getBlockY(); d += 0.25) { double dist = top.getBlockY() - base.getBlockY();
for (double d = 0; d <= dist; d += 0.25) {
Location spoutl = base.clone().add(0, d, 0); Location spoutl = base.clone().add(0, d, 0);
if (loc0.distance(spoutl) <= radius) { if (loc0.distance(spoutl) <= radius) {
removed = true; removed = true;