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

Combos now check for specific elements

Browse source
This commit is contained in:
nathank33 2015-01-29 23:46:21 -08:00
parent 1d3ded62f6
commit 913ab45872
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@ import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.BendingPlayer; import com.projectkorra.ProjectKorra.BendingPlayer;
import com.projectkorra.ProjectKorra.ComboManager.ClickType; import com.projectkorra.ProjectKorra.ComboManager.ClickType;
import com.projectkorra.ProjectKorra.Commands; import com.projectkorra.ProjectKorra.Commands;
import com.projectkorra.ProjectKorra.Element;
import com.projectkorra.ProjectKorra.Flight; import com.projectkorra.ProjectKorra.Flight;
import com.projectkorra.ProjectKorra.Methods; import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra; import com.projectkorra.ProjectKorra.ProjectKorra;
@ -99,11 +100,13 @@ public class AirCombo {
public AirCombo(Player player, String ability) { public AirCombo(Player player, String ability) {
if (!enabled || !player.hasPermission("bending.ability.AirCombo")) if (!enabled || !player.hasPermission("bending.ability.AirCombo"))
return; return;
if (Methods.isRegionProtectedFromBuild(player, "AirBlast", if(!Methods.getBendingPlayer(player.getName()).hasElement(Element.Air))
player.getLocation()))
return; return;
if (Commands.isToggledForAll) if (Commands.isToggledForAll)
return; return;
if (Methods.isRegionProtectedFromBuild(player, "AirBlast",
player.getLocation()))
return;
if (!Methods.getBendingPlayer(player.getName()).isToggled()) if (!Methods.getBendingPlayer(player.getName()).isToggled())
return; return;
time = System.currentTimeMillis(); time = System.currentTimeMillis();

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

@ -18,6 +18,7 @@ import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.BendingPlayer; import com.projectkorra.ProjectKorra.BendingPlayer;
import com.projectkorra.ProjectKorra.ComboManager.ClickType; import com.projectkorra.ProjectKorra.ComboManager.ClickType;
import com.projectkorra.ProjectKorra.Commands; import com.projectkorra.ProjectKorra.Commands;
import com.projectkorra.ProjectKorra.Element;
import com.projectkorra.ProjectKorra.Methods; import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra; import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.Ability.AvatarState; import com.projectkorra.ProjectKorra.Ability.AvatarState;
@ -103,11 +104,13 @@ public class FireCombo {
// Dont' call Methods.canBind directly, it doesn't let you combo as fast // Dont' call Methods.canBind directly, it doesn't let you combo as fast
if (!enabled || !player.hasPermission("bending.ability.FireCombo")) if (!enabled || !player.hasPermission("bending.ability.FireCombo"))
return; return;
if (Methods.isRegionProtectedFromBuild(player, "Blaze", if(!Methods.getBendingPlayer(player.getName()).hasElement(Element.Fire))
player.getLocation()))
return; return;
if (Commands.isToggledForAll) if (Commands.isToggledForAll)
return; return;
if (Methods.isRegionProtectedFromBuild(player, "Blaze",
player.getLocation()))
return;
if (!Methods.getBendingPlayer(player.getName()).isToggled()) if (!Methods.getBendingPlayer(player.getName()).isToggled())
return; return;
time = System.currentTimeMillis(); time = System.currentTimeMillis();

7
src/com/projectkorra/ProjectKorra/waterbending/WaterCombo.java
View file

@ -15,6 +15,7 @@ import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.BendingPlayer; import com.projectkorra.ProjectKorra.BendingPlayer;
import com.projectkorra.ProjectKorra.Commands; import com.projectkorra.ProjectKorra.Commands;
import com.projectkorra.ProjectKorra.Element;
import com.projectkorra.ProjectKorra.Methods; import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra; import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.TempBlock; import com.projectkorra.ProjectKorra.TempBlock;
@ -81,11 +82,13 @@ public class WaterCombo {
public WaterCombo(Player player, String ability) { public WaterCombo(Player player, String ability) {
if (!enabled || !player.hasPermission("bending.ability.WaterCombo")) if (!enabled || !player.hasPermission("bending.ability.WaterCombo"))
return; return;
if (Methods.isRegionProtectedFromBuild(player, "WaterManipulation", if(!Methods.getBendingPlayer(player.getName()).hasElement(Element.Water))
player.getLocation()))
return; return;
if (Commands.isToggledForAll) if (Commands.isToggledForAll)
return; return;
if (Methods.isRegionProtectedFromBuild(player, "WaterManipulation",
player.getLocation()))
return;
if (!Methods.getBendingPlayer(player.getName()).isToggled()) if (!Methods.getBendingPlayer(player.getName()).isToggled())
return; return;
time = System.currentTimeMillis(); time = System.currentTimeMillis();