Small Changes

Removed all references to Bloodbending in Suffocate and *maybe* fixed
Earthbending reverting regardless of config.
This commit is contained in:
AlexTheCoder 2014-08-26 14:28:59 -04:00
parent cc5b93a6ee
commit 659bcb1938
2 changed files with 7 additions and 3 deletions

View file

@ -1802,6 +1802,7 @@ public class Methods {
AirSwipe.instances.clear();
Tornado.instances.clear();
AirBurst.removeAll();
Suffocate.removeAll();
Catapult.removeAll();
CompactColumn.removeAll();
@ -1840,7 +1841,10 @@ public class Methods {
Flight.removeAll();
WaterReturn.removeAll();
TempBlock.removeAll();
removeAllEarthbendedBlocks();
if(ProjectKorra.plugin.getConfig().getBoolean("Properties.Earth.RevertEarthbending")) {
removeAllEarthbendedBlocks();
}
EarthPassive.removeAll();
}

View file

@ -42,7 +42,7 @@ public class Suffocate {
for (Entity entity : Methods.getEntitiesAroundPoint(player.getLocation(), range)) {
if (entity instanceof LivingEntity) {
if (entity instanceof Player) {
if (Methods.isRegionProtectedFromBuild(player, "Bloodbending", entity.getLocation()) || entity.getEntityId() == player.getEntityId())
if (Methods.isRegionProtectedFromBuild(player, "Suffocate", entity.getLocation()) || entity.getEntityId() == player.getEntityId())
continue;
}
if (System.currentTimeMillis() >= time + warmup) {
@ -55,7 +55,7 @@ public class Suffocate {
Entity target = Methods.getTargetedEntity(player, range, new ArrayList<Entity>());
if (target == null)
return;
if (!(target instanceof LivingEntity)|| Methods.isRegionProtectedFromBuild(player, "Bloodbending", target.getLocation()))
if (!(target instanceof LivingEntity)|| Methods.isRegionProtectedFromBuild(player, "Suffocate", target.getLocation()))
return;
if (!canBeUsedOnUndead && isUndead(target)) {
return;