From 54e066d7808366758ee04fa585be9ece8f5f1aa6 Mon Sep 17 00:00:00 2001
From: runefist <runefist@hotmail.com>
Date: Wed, 5 Nov 2014 01:28:59 +0100
Subject: [PATCH] EarthBlast Fix

- Earthblast fix
- Fix for ExtraAbility
---
 .../ProjectKorra/Ability/AbilityModuleManager.java           | 5 ++++-
 .../projectkorra/ProjectKorra/earthbending/EarthBlast.java   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
index 04d93677..bb0af116 100644
--- a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
+++ b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
@@ -153,11 +153,14 @@ public class AbilityModuleManager {
 		}
 		for (AbilityModule ab: ability) {
 			//To check if EarthBlast == Earthblast or for example, EarthBlast == EARTHBLAST
+                        boolean succes = true;
                         for(String enabledAbility : abilities){
                             if(enabledAbility.equalsIgnoreCase(ab.getName())){
-                                continue;
+                                succes = false;
                             }
                         }
+                        if (!succes)
+                            continue;
  			ab.onThisLoad();
  			abilities.add(ab.getName());
                         for (StockAbilities a: StockAbilities.values()) {
diff --git a/src/com/projectkorra/ProjectKorra/earthbending/EarthBlast.java b/src/com/projectkorra/ProjectKorra/earthbending/EarthBlast.java
index 13754f75..0b0a6bb5 100644
--- a/src/com/projectkorra/ProjectKorra/earthbending/EarthBlast.java
+++ b/src/com/projectkorra/ProjectKorra/earthbending/EarthBlast.java
@@ -310,8 +310,9 @@ public class EarthBlast {
 						Location location = player.getEyeLocation();
 						Vector vector = location.getDirection();
 						entity.setVelocity(vector.normalize().multiply(pushfactor));
+                                                double damage = this.damage;
 						if (Methods.isMetal(sourceblock) && Methods.canMetalbend(player)) {
-							damage = Methods.getMetalAugment(damage);
+							damage = Methods.getMetalAugment(this.damage);
 						}
 						Methods.damageEntity(player, entity, damage);
 						progressing = false;