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

Made FireComboStream static and the block abilities list public

Browse source
This commit is contained in:
nathank33 2014-10-11 17:10:00 -07:00
parent fc9b84ae59
commit 7ee9fd9e18
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/com/projectkorra/ProjectKorra/firebending/FireCombo.java
View file

@ -26,7 +26,7 @@ import com.projectkorra.ProjectKorra.waterbending.Bloodbending;
public class FireCombo
{
private static final List<String> abilitiesToBlock = new ArrayList<String>(){
public static final List<String> abilitiesToBlock = new ArrayList<String>(){
private static final long serialVersionUID = 5395690551860441647L;
{
add("AirShield");
@ -177,7 +177,7 @@ public class FireCombo
}
currentLoc = ((FireComboStream)tasks.get(0)).getLocation();
for(FireComboStream stream : tasks)
if(Methods.blockAbilities(player, abilitiesToBlock, currentLoc, 2))
if(Methods.blockAbilities(player, abilitiesToBlock, stream.currentLoc, 2))
stream.remove();
}
else if(tasks.size() == 0){
@ -445,7 +445,7 @@ public class FireCombo
list.add(lf);
return list;
}
public class FireComboStream extends BukkitRunnable
public static class FireComboStream extends BukkitRunnable
{
private Vector direction;
private double speed;
@ -506,9 +506,12 @@ public class FireCombo
if(singlePoint)
remove();
}
public void cancel(){
remove();
}
public void remove()
{
this.cancel();
super.cancel();
this.cancelled = true;
}
public Location getLocation(){