diff --git a/src/com/projectkorra/ProjectKorra/airbending/AirCombo.java b/src/com/projectkorra/ProjectKorra/airbending/AirCombo.java index a2588461..0aeac134 100644 --- a/src/com/projectkorra/ProjectKorra/airbending/AirCombo.java +++ b/src/com/projectkorra/ProjectKorra/airbending/AirCombo.java @@ -13,6 +13,7 @@ import org.bukkit.util.Vector; import com.projectkorra.ProjectKorra.BendingPlayer; import com.projectkorra.ProjectKorra.ComboManager.ClickType; import com.projectkorra.ProjectKorra.Commands; +import com.projectkorra.ProjectKorra.Element; import com.projectkorra.ProjectKorra.Flight; import com.projectkorra.ProjectKorra.Methods; import com.projectkorra.ProjectKorra.ProjectKorra; @@ -99,11 +100,13 @@ public class AirCombo { public AirCombo(Player player, String ability) { if (!enabled || !player.hasPermission("bending.ability.AirCombo")) return; - if (Methods.isRegionProtectedFromBuild(player, "AirBlast", - player.getLocation())) + if(!Methods.getBendingPlayer(player.getName()).hasElement(Element.Air)) return; if (Commands.isToggledForAll) return; + if (Methods.isRegionProtectedFromBuild(player, "AirBlast", + player.getLocation())) + return; if (!Methods.getBendingPlayer(player.getName()).isToggled()) return; time = System.currentTimeMillis(); diff --git a/src/com/projectkorra/ProjectKorra/firebending/FireCombo.java b/src/com/projectkorra/ProjectKorra/firebending/FireCombo.java index 5be67f18..f85bcd47 100644 --- a/src/com/projectkorra/ProjectKorra/firebending/FireCombo.java +++ b/src/com/projectkorra/ProjectKorra/firebending/FireCombo.java @@ -18,6 +18,7 @@ import org.bukkit.util.Vector; import com.projectkorra.ProjectKorra.BendingPlayer; import com.projectkorra.ProjectKorra.ComboManager.ClickType; import com.projectkorra.ProjectKorra.Commands; +import com.projectkorra.ProjectKorra.Element; import com.projectkorra.ProjectKorra.Methods; import com.projectkorra.ProjectKorra.ProjectKorra; 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 if (!enabled || !player.hasPermission("bending.ability.FireCombo")) return; - if (Methods.isRegionProtectedFromBuild(player, "Blaze", - player.getLocation())) + if(!Methods.getBendingPlayer(player.getName()).hasElement(Element.Fire)) return; if (Commands.isToggledForAll) return; + if (Methods.isRegionProtectedFromBuild(player, "Blaze", + player.getLocation())) + return; if (!Methods.getBendingPlayer(player.getName()).isToggled()) return; time = System.currentTimeMillis(); diff --git a/src/com/projectkorra/ProjectKorra/waterbending/WaterCombo.java b/src/com/projectkorra/ProjectKorra/waterbending/WaterCombo.java index 8c2955d8..40a306bb 100644 --- a/src/com/projectkorra/ProjectKorra/waterbending/WaterCombo.java +++ b/src/com/projectkorra/ProjectKorra/waterbending/WaterCombo.java @@ -15,6 +15,7 @@ import org.bukkit.util.Vector; import com.projectkorra.ProjectKorra.BendingPlayer; import com.projectkorra.ProjectKorra.Commands; +import com.projectkorra.ProjectKorra.Element; import com.projectkorra.ProjectKorra.Methods; import com.projectkorra.ProjectKorra.ProjectKorra; import com.projectkorra.ProjectKorra.TempBlock; @@ -81,11 +82,13 @@ public class WaterCombo { public WaterCombo(Player player, String ability) { if (!enabled || !player.hasPermission("bending.ability.WaterCombo")) return; - if (Methods.isRegionProtectedFromBuild(player, "WaterManipulation", - player.getLocation())) + if(!Methods.getBendingPlayer(player.getName()).hasElement(Element.Water)) return; if (Commands.isToggledForAll) return; + if (Methods.isRegionProtectedFromBuild(player, "WaterManipulation", + player.getLocation())) + return; if (!Methods.getBendingPlayer(player.getName()).isToggled()) return; time = System.currentTimeMillis();