EffectBase sources and fail conditions static maps removed

2024-08-20 20:43:29 -05:00
parent c2633d0d9f
commit c01c69db83
7 changed files with 36 additions and 107 deletions
@@ -375,7 +375,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
            if (eff == null) {
                continue;
            }
-            if (eff.containsSource(source) && trains >= eff.getTrains()) {
+            if (eff.getEffectsBase().effectSources.contains(source) && trains >= eff.getTrains()) {
                if (removeAll) {
                    //remove all effects of source type
                    if (eff.cancel()) {
@@ -433,12 +433,6 @@ public class Effect {
        return duration;
    }

-    public boolean containsSource(EffectSourceType source) {
-        if (this.eb != null)
-            return this.eb.containsSource(source);
-        return false;
-    }
-
    public JobContainer getJobContainer() {
        return this.jc;
    }