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

Small Changes

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/com/projectkorra/ProjectKorra/Methods.java
View file

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

4
src/com/projectkorra/ProjectKorra/airbending/Suffocate.java
View file

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