External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix Contested Game Ball

Browse source
This commit is contained in:
xenohedron 2023-11-09 22:05:22 -05:00
parent 933d694b08
commit d937f7279e
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/a/AlelaCunningConqueror.java
View file

@ -89,14 +89,12 @@ class AlelaCunningConquerorTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
DamagedBatchEvent dEvent = (DamagedBatchEvent) event;
if (dEvent == null) {
if (!dEvent.isCombatDamage()) {
return false;
}
List<DamagedEvent> events = dEvent
.getEvents()
.stream()
.filter(DamagedEvent::isCombatDamage)
.filter(e -> {
Permanent permanent = game.getPermanentOrLKIBattlefield(e.getSourceId());
return permanent != null

9
Mage.Sets/src/mage/cards/c/ContestedGameBall.java
View file

@ -22,7 +22,7 @@ import mage.constants.Outcome;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.events.DamagedEvent;
import mage.game.events.DamagedBatchEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.TreasureToken;
@ -79,15 +79,12 @@ class ContestedGameBallTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DAMAGED_PLAYER;
return event.getType() == GameEvent.EventType.DAMAGED_BATCH_FOR_ONE_PLAYER;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getTargetId() != this.getControllerId()) {
return false;
}
if (((DamagedEvent) event).isCombatDamage()) {
if (((DamagedBatchEvent) event).isCombatDamage() && event.getPlayerId().equals(this.getControllerId())) {
this.getAllEffects().setTargetPointer(new FixedTarget(game.getActivePlayerId()));
// attacking player is active player
return true;

6
Mage/src/main/java/mage/game/events/DamagedBatchEvent.java
View file

@ -14,7 +14,7 @@ public abstract class DamagedBatchEvent extends GameEvent implements BatchGameEv
private final Class<? extends DamagedEvent> damageClazz;
private final Set<DamagedEvent> events = new HashSet<>();
public DamagedBatchEvent(EventType type, Class<? extends DamagedEvent> damageClazz) {
protected DamagedBatchEvent(EventType type, Class<? extends DamagedEvent> damageClazz) {
super(type, null, null, null);
this.damageClazz = damageClazz;
}
@ -40,6 +40,10 @@ public abstract class DamagedBatchEvent extends GameEvent implements BatchGameEv
.sum();
}
public boolean isCombatDamage() {
return events.stream().anyMatch(DamagedEvent::isCombatDamage);
}
@Override
@Deprecated // events can store a diff value, so search it from events list instead
public UUID getTargetId() {