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

FastSwim can be used with EarthArmor

Browse source
This commit is contained in:
MistPhizzle 2014-07-26 21:06:47 -04:00
parent 05502e03c0
commit a1f2c2565f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
View file

@ -103,7 +103,6 @@ public class AbilityModuleManager {
if (a == StockAbilities.EarthBlast) shiftabilities.add(a.name());
if (a == StockAbilities.Shockwave) shiftabilities.add(a.name());
if (a == StockAbilities.EarthTunnel) shiftabilities.add(a.name());
if (a == StockAbilities.EarthArmor) shiftabilities.add(a.name());
if (a == StockAbilities.EarthGrab) shiftabilities.add(a.name());
if (a == StockAbilities.Extraction) metalbendingabilities.add(a.name());
}

3
src/com/projectkorra/ProjectKorra/waterbending/WaterPassive.java
View file

@ -10,6 +10,7 @@ import com.projectkorra.ProjectKorra.Element;
import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.Ability.AbilityModuleManager;
import com.projectkorra.ProjectKorra.earthbending.EarthArmor;
public class WaterPassive {
@ -28,7 +29,7 @@ public class WaterPassive {
for (Player player: Bukkit.getServer().getOnlinePlayers()) {
String ability = Methods.getBoundAbility(player);
if (Methods.canBendPassive(player.getName(), Element.Water)) {
if (WaterSpout.instances.containsKey(player)) {
if (WaterSpout.instances.containsKey(player) || EarthArmor.instances.containsKey(player)) {
continue;
} else if (ability == null || !AbilityModuleManager.shiftabilities.contains(ability)) {
if (player.isSneaking() && Methods.isWater(player.getLocation().getBlock())) {