Merge Damage and Source types.

2024-02-26 03:44:51 -05:00
parent a7b3fba018
commit e8e84e00af
16 changed files with 177 additions and 311 deletions
@@ -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);