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

refactor: improved damaged batch events, added todo to fix (related to #10870)

Browse source
This commit is contained in:
Oleg Agafonov 2023-09-13 03:05:54 +04:00
parent d056f81ecc
commit 316e0dc1f3
27 changed files with 138 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/abilities/common/CombatDamageDealtToYouTriggeredAbility.java
View file

@ -4,9 +4,7 @@ import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamagedEvent;
import mage.game.events.DamagedPlayerBatchEvent;
import mage.game.events.DamagedPlayerEvent;
import mage.game.events.DamagedBatchForPlayersEvent;
import mage.game.events.GameEvent;
import mage.target.targetpointer.FixedTarget;
@ -65,12 +63,12 @@ public class CombatDamageDealtToYouTriggeredAbility extends TriggeredAbilityImpl
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DAMAGED_PLAYER_BATCH;
return event.getType() == GameEvent.EventType.DAMAGED_BATCH_FOR_PLAYERS;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
DamagedPlayerBatchEvent damageEvent = (DamagedPlayerBatchEvent) event;
DamagedBatchForPlayersEvent damageEvent = (DamagedBatchForPlayersEvent) event;
boolean check = damageEvent.getEvents()
.stream()
.anyMatch(c -> c.isCombatDamage() && c.getPlayerId() == this.controllerId);