From 081c5520e8caf39a8ce96f415c27880883160965 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Tue, 12 Sep 2023 17:31:31 +0200 Subject: [PATCH 1/2] Fix crash on flashback Zenith --- forge-game/src/main/java/forge/game/CardTraitBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java index defab246258..426e9b32f73 100644 --- a/forge-game/src/main/java/forge/game/CardTraitBase.java +++ b/forge-game/src/main/java/forge/game/CardTraitBase.java @@ -263,7 +263,7 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView, final Game game = hostController.getGame(); // intervening if check, make sure to use right controller - if (game.getStack().isResolving(getHostCard())) { + if (!game.getStack().isEmpty() && game.getStack().isResolving(getHostCard())) { SpellAbility sa = game.getStack().peek().getSpellAbility(); if (sa.isTrigger()) { hostController = sa.getActivatingPlayer(); From 279acdef8b94589c84b5f3ba6d77e2db74429fa6 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Tue, 12 Sep 2023 17:32:04 +0200 Subject: [PATCH 2/2] WOE rules changed --- .../java/forge/game/ability/effects/RegenerationEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java index c106bd53f56..eed76f8660c 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java @@ -24,7 +24,7 @@ public class RegenerationEffect extends SpellAbilityEffect { c.setDamage(0); c.setHasBeenDealtDeathtouchDamage(false); - c.tap(true, cause, cause == null ? null : cause.getActivatingPlayer()); + c.tap(true, cause, c.getController()); c.addRegeneratedThisTurn(); if (game.getCombat() != null) {