TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-01-06 23:10:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix Cooldowns

Browse source
This commit is contained in:
jedk1 2015-12-26 22:40:15 +00:00
parent 44f395ddc4
commit 22afc47f61
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,9 +94,9 @@ public class Shockwave {
for (double theta = 0; theta < 360; theta += dtheta) {
double rtheta = Math.toRadians(theta);
Vector vector = new Vector(Math.cos(rtheta), 0, Math.sin(rtheta));
GeneralMethods.getBendingPlayer(player.getName()).addCooldown("Shockwave", cooldown);
new Ripple(player, vector.normalize());
}
GeneralMethods.getBendingPlayer(player.getName()).addCooldown("Shockwave", cooldown);
}
public static void coneShockwave(Player player) {
@ -107,9 +107,9 @@ public class Shockwave {
double rtheta = Math.toRadians(theta);
Vector vector = new Vector(Math.cos(rtheta), 0, Math.sin(rtheta));
if (vector.angle(player.getEyeLocation().getDirection()) < angle)
GeneralMethods.getBendingPlayer(player.getName()).addCooldown("Shockwave", cooldown);
new Ripple(player, vector.normalize());
}
GeneralMethods.getBendingPlayer(player.getName()).addCooldown("Shockwave", cooldown);
instances.remove(player);
}
}

6
src/com/projectkorra/projectkorra/firebending/FireBurst.java
View file

@ -29,7 +29,7 @@ public class FireBurst implements ConfigLoadable {
private int damage = config.get().getInt("Abilities.Fire.FireBurst.Damage");
private long chargetime = config.get().getLong("Abilities.Fire.FireBurst.ChargeTime");
private long range = config.get().getLong("Abilities.Fire.FireBurst.Range");
private static long cooldown = config.get().getLong("Abilities.Air.Flight.Cooldown");
private static long cooldown = config.get().getLong("Abilities.Fire.FireBurst.Cooldown");
private double deltheta = 10;
private double delphi = 10;
private boolean charged = false;
@ -91,12 +91,12 @@ public class FireBurst implements ConfigLoadable {
if (direction.angle(vector) <= angle) {
// Methods.verbose(direction.angle(vector));
// Methods.verbose(direction);
GeneralMethods.getBendingPlayer(player.getName()).addCooldown("FireBurst", cooldown);
FireBlast fblast = new FireBlast(location, direction.normalize(), player, damage, safeblocks);
fblast.setRange(this.range);
}
}
}
GeneralMethods.getBendingPlayer(player.getName()).addCooldown("FireBurst", cooldown);
}
// Methods.verbose("--" + AirBlast.instances.size() + "--");
remove();
@ -221,13 +221,13 @@ public class FireBurst implements ConfigLoadable {
y = r * Math.sin(rphi) * Math.sin(rtheta);
z = r * Math.cos(rtheta);
Vector direction = new Vector(x, z, y);
GeneralMethods.getBendingPlayer(player.getName()).addCooldown("FireBurst", cooldown);
FireBlast fblast = new FireBlast(location, direction.normalize(), player, damage, safeblocks);
fblast.setRange(this.range);
fblast.setShowParticles(false);
blasts.add(fblast);
}
}
GeneralMethods.getBendingPlayer(player.getName()).addCooldown("FireBurst", cooldown);
}
// Methods.verbose("--" + AirBlast.instances.size() + "--");
remove();