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

game: fixed wrong usage of batch events (related to #10870)

Browse source
This commit is contained in:
Oleg Agafonov 2023-09-13 04:42:46 +04:00
parent ba3b0e4cb7
commit be4bff6097
6 changed files with 64 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/abilities/TriggeredAbilities.java
View file

@ -1,5 +1,3 @@
package mage.abilities;
import mage.MageObject;
@ -9,6 +7,7 @@ import mage.game.events.GameEvent;
import mage.game.events.NumberOfTriggersEvent;
import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import mage.util.CardUtil;
import org.apache.log4j.Logger;
import java.util.*;
@ -64,9 +63,10 @@ public class TriggeredAbilities extends ConcurrentHashMap<String, TriggeredAbili
if (event == null || !game.getContinuousEffects().preventedByRuleModification(event, ability, game, false)) {
if (object != null) {
boolean controllerSet = false;
Set<UUID> eventTargets = CardUtil.getEventTargets(event);
if (ability.getZone() != Zone.COMMAND
&& event != null
&& event.getTargetId() != null
&& !eventTargets.isEmpty()
&& ability.isLeavesTheBattlefieldTrigger()
&& game.getLKI().get(Zone.BATTLEFIELD) != null
&& game.getLKI().get(Zone.BATTLEFIELD).containsKey(ability.getSourceId())) {