TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Fixed AirSwipe (#572)

Browse source 
• Fixed AirSwipe being able to release more AirSwipes while charing (now
just releases the charged one)
This commit is contained in:
StrangeOne101 2016-09-05 15:38:05 +12:00 committed by OmniCypher
parent 5f935f135c
commit 184feea3fa
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package com.projectkorra.projectkorra.airbending;
import com.projectkorra.projectkorra.GeneralMethods; import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ProjectKorra; import com.projectkorra.projectkorra.ProjectKorra;
import com.projectkorra.projectkorra.ability.AirAbility; import com.projectkorra.projectkorra.ability.AirAbility;
import com.projectkorra.projectkorra.ability.CoreAbility;
import com.projectkorra.projectkorra.ability.EarthAbility; import com.projectkorra.projectkorra.ability.EarthAbility;
import com.projectkorra.projectkorra.ability.WaterAbility; import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.avatar.AvatarState; import com.projectkorra.projectkorra.avatar.AvatarState;
@ -51,7 +52,6 @@ public class AirSwipe extends AirAbility {
private double maxChargeFactor; private double maxChargeFactor;
private Location origin; private Location origin;
private Random random; private Random random;
private AirSwipe ability;
private Map<Vector, Location> elements; private Map<Vector, Location> elements;
private ArrayList<Entity> affectedEntities; private ArrayList<Entity> affectedEntities;
@ -62,7 +62,16 @@ public class AirSwipe extends AirAbility {
public AirSwipe(Player player, boolean charging) { public AirSwipe(Player player, boolean charging) {
super(player); super(player);
ability = this; if (CoreAbility.hasAbility(player, AirSwipe.class)) {
for (AirSwipe ability : CoreAbility.getAbilities(player, AirSwipe.class)) {
if (ability.charging) {
ability.launch();
ability.charging = false;
return;
}
}
}
this.charging = charging; this.charging = charging;
this.origin = player.getEyeLocation(); this.origin = player.getEyeLocation();
this.particles = getConfig().getInt("Abilities.Air.AirSwipe.Particles"); this.particles = getConfig().getInt("Abilities.Air.AirSwipe.Particles");
@ -192,6 +201,7 @@ public class AirSwipe extends AirAbility {
for (int i = 0; i < entities.size(); i++) { for (int i = 0; i < entities.size(); i++) {
final Entity entity = entities.get(i); final Entity entity = entities.get(i);
final AirSwipe abil = this;
new BukkitRunnable() { new BukkitRunnable() {
public void run() { public void run() {
if (GeneralMethods.isRegionProtectedFromBuild(AirSwipe.this, entity.getLocation())) { if (GeneralMethods.isRegionProtectedFromBuild(AirSwipe.this, entity.getLocation())) {
@ -212,7 +222,7 @@ public class AirSwipe extends AirAbility {
} }
if (entity instanceof LivingEntity && !affectedEntities.contains(entity)) { if (entity instanceof LivingEntity && !affectedEntities.contains(entity)) {
if (damage != 0) { if (damage != 0) {
DamageHandler.damageEntity(entity, damage, ability); DamageHandler.damageEntity(entity, damage, abil);
} }
affectedEntities.add(entity); affectedEntities.add(entity);
} }