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

Added another isRegionProtected check for AirCombo.

Browse source
This commit is contained in:
nathank33 2014-10-14 12:46:16 -07:00
parent e588b07d56
commit 1ca9337dcc
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,10 +46,12 @@ public class AirCombo {
.getDouble("Abilities.Air.AirCombo.AirStream.Speed"); .getDouble("Abilities.Air.AirCombo.AirStream.Speed");
public static double AIR_STREAM_RANGE = ProjectKorra.plugin.getConfig() public static double AIR_STREAM_RANGE = ProjectKorra.plugin.getConfig()
.getDouble("Abilities.Air.AirCombo.AirStream.Range"); .getDouble("Abilities.Air.AirCombo.AirStream.Range");
public static double AIR_STREAM_ENTITY_HEIGHT = ProjectKorra.plugin.getConfig() public static double AIR_STREAM_ENTITY_HEIGHT = ProjectKorra.plugin
.getDouble("Abilities.Air.AirCombo.AirStream.EntityHeight"); .getConfig().getDouble(
public static long AIR_STREAM_ENTITY_DURATION = ProjectKorra.plugin.getConfig() "Abilities.Air.AirCombo.AirStream.EntityHeight");
.getLong("Abilities.Air.AirCombo.AirStream.EntityDuration"); public static long AIR_STREAM_ENTITY_DURATION = ProjectKorra.plugin
.getConfig().getLong(
"Abilities.Air.AirCombo.AirStream.EntityDuration");
public static long AIR_STREAM_COOLDOWN = ProjectKorra.plugin.getConfig() public static long AIR_STREAM_COOLDOWN = ProjectKorra.plugin.getConfig()
.getLong("Abilities.Air.AirCombo.AirStream.Cooldown"); .getLong("Abilities.Air.AirCombo.AirStream.Cooldown");
@ -405,7 +407,12 @@ public class AirCombo {
return; return;
} }
if (i % 3 == 0) { if (i % 3 == 0) {
for (Entity entity : Methods.getEntitiesAroundPoint(loc, 2.5)) for (Entity entity : Methods.getEntitiesAroundPoint(loc, 2.5)) {
if (Methods.isRegionProtectedFromBuild(player, "AirBlast",
entity.getLocation())) {
remove();
return;
}
if (!entity.equals(player) if (!entity.equals(player)
&& !affectedEntities.contains(entity)) { && !affectedEntities.contains(entity)) {
affectedEntities.add(entity); affectedEntities.add(entity);
@ -417,6 +424,7 @@ public class AirCombo {
if (entity instanceof LivingEntity) if (entity instanceof LivingEntity)
Methods.damageEntity(player, entity, damage); Methods.damageEntity(player, entity, damage);
} }
}
if (Methods.blockAbilities(player, FireCombo.abilitiesToBlock, if (Methods.blockAbilities(player, FireCombo.abilitiesToBlock,
loc, 1)) { loc, 1)) {