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

Less likely to kick players affected by AirCombo

Browse source
This commit is contained in:
nathank33 2014-10-24 00:29:44 -07:00
parent 33eb94377b
commit e7474eabff
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/projectkorra/ProjectKorra/Flight.java
View file

@ -54,12 +54,12 @@ public class Flight {
return null;
}
private void revert() {
public void revert() {
player.setAllowFlight(couldFly);
player.setFlying(wasFlying);
}
private void remove() {
public void remove() {
instances.remove(player);
}

15
src/com/projectkorra/ProjectKorra/airbending/AirCombo.java
View file

@ -15,6 +15,7 @@ import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.BendingPlayer;
import com.projectkorra.ProjectKorra.ComboManager.ClickType;
import com.projectkorra.ProjectKorra.Flight;
import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.Ability.AvatarState;
@ -92,6 +93,7 @@ public class AirCombo {
private AbilityState state;
private ArrayList<Entity> affectedEntities = new ArrayList<Entity>();
private ArrayList<BukkitRunnable> tasks = new ArrayList<BukkitRunnable>();
private ArrayList<Flight> flights = new ArrayList<Flight>();
public AirCombo(Player player, String ability) {
if (!enabled || !player.hasPermission("bending.ability.AirCombo"))
@ -293,8 +295,12 @@ public class AirCombo {
time = System.currentTimeMillis();
}
if (!entity.equals(player)
&& !affectedEntities.contains(entity))
&& !affectedEntities.contains(entity)) {
affectedEntities.add(entity);
if (entity instanceof Player) {
flights.add(new Flight((Player) entity, player));
}
}
}
for (Entity entity : affectedEntities) {
@ -438,6 +444,13 @@ public class AirCombo {
instances.remove(this);
for (BukkitRunnable task : tasks)
task.cancel();
for (int i = 0; i < flights.size(); i++) {
Flight flight = flights.get(i);
flight.revert();
flight.remove();
flights.remove(i);
i--;
}
}
public static void progressAll() {