Merge Damage and Source types.

src/engine/powers/effectmodifiers/HealthEffectModifier.java

@@ -8,8 +8,6 @@
 
 
 package engine.powers.effectmodifiers;
-
-import engine.Enum.DamageType;
 import engine.Enum.GameObjectType;
 import engine.Enum.ModType;
 import engine.Enum.SourceType;
@@ -29,13 +27,13 @@ import java.util.concurrent.ThreadLocalRandom;
 
 public class HealthEffectModifier extends AbstractEffectModifier {
 
-    private DamageType damageType;
+    private SourceType damageType;
 
     public HealthEffectModifier(ResultSet rs) throws SQLException {
         super(rs);
         String damageTypeDB = rs.getString("type");
         try {
-            this.damageType = DamageType.valueOf(damageTypeDB);
+            this.damageType = SourceType.valueOf(damageTypeDB);
         } catch (IllegalArgumentException e) {
             Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID
                     + " value received = '" + damageTypeDB + '\'', e);
@@ -205,7 +203,7 @@ public class HealthEffectModifier extends AbstractEffectModifier {
 				}*/
 
                 PlayerBonuses bonus = ac.getBonuses();
-                if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) {
+                if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Healing) >= trains) {
                     ModifyHealthMsg mhm = new ModifyHealthMsg(source, ac, 0f, 0f, 0f, powerID, powerName, trains, effectID);
                     mhm.setUnknown03(5); //set target is immune
                     DispatchMessage.sendToAllInRange(ac, mhm);