Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Tokens rework:

Browse source 
- added reminder / helper tokens support (example: Copy, Morph, Day // Night, related to #10139);
 - added verify checks for reminder tokens;
 - added images download for reminder tokens;
This commit is contained in:
Oleg Agafonov 2023-04-27 18:45:50 +04:00
parent 0e1e6a0f21
commit f86cf176d7
11 changed files with 242 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java
View file

@ -1273,12 +1273,12 @@ public class ContinuousEffects implements Serializable {
}
public synchronized void addEffect(ContinuousEffect effect, Ability source) {
if (effect == null) {
logger.error("Effect is null: " + source.toString());
return;
} else if (source == null) {
logger.warn("Adding effect without ability : " + effect);
if (effect == null || source == null) {
// addEffect(effect, source) need a non-null source
throw new IllegalArgumentException("Wrong code usage. Effect and source can't be null here: "
+ source + "; " + effect);
}
switch (effect.getEffectType()) {
case REPLACEMENT:
case REDIRECTION:
@ -1313,9 +1313,12 @@ public class ContinuousEffects implements Serializable {
case CONTINUOUS_RULE_MODIFICATION:
continuousRuleModifyingEffects.addEffect((ContinuousRuleModifyingEffect) effect, source);
break;
default:
case CONTINUOUS:
case ONESHOT:
layeredEffects.addEffect(effect, source);
break;
default:
throw new IllegalArgumentException("Unknown effect type: " + effect.getEffectType());
}
}