Fix #10631 (Forge, Neverwinter Charlatan)

This commit is contained in:
xenohedron 2023-07-16 16:19:31 -04:00
parent 809c02eb8d
commit a5dbf30605
2 changed files with 12 additions and 7 deletions

View file

@ -44,22 +44,25 @@ public class SacrificeAllTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
boolean sacrificed = false;
switch (sacrificingPlayer) {
case YOU:
if (event.getPlayerId().equals(getControllerId())) {
sacrificed = true;
if (!event.getPlayerId().equals(getControllerId())) {
return false;
}
break;
case OPPONENT:
Player controller = game.getPlayer(getControllerId());
if (controller == null || controller.hasOpponent(event.getPlayerId(), game)) {
sacrificed = true;
if (controller == null || !controller.hasOpponent(event.getPlayerId(), game)) {
return false;
}
break;
case ANY:
break;
default:
return false;
}
Permanent sacrificedPermanent = game.getPermanentOrLKIBattlefield(event.getTargetId());
return sacrificed && filter.match(sacrificedPermanent, getControllerId(), this, game);
return sacrificedPermanent != null && filter.match(sacrificedPermanent, getControllerId(), this, game);
}
private String generateTriggerPhrase() {