Merge Damage and Source types.

src/engine/objects/AbstractCharacter.java

@@ -1651,7 +1651,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         PowersManager.cancelOnTakeDamage(this);
     }
 
-    public final void cancelOnTakeDamage(final DamageType type, final float amount) {
+    public final void cancelOnTakeDamage(final SourceType type, final float amount) {
         boolean changed = false;
         for (String s : this.effects.keySet()) {
             Effect eff = this.effects.get(s);