external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 01:38:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3768 from tool4ever/regfix

Browse Source 
Regeneration: controller always taps
This commit is contained in:
kevlahnota
2023-09-13 05:57:08 +08:00
committed by GitHub
parent 8ac19e6bb0 279acdef8b
commit 4fab3d6884
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/CardTraitBase.java
View File

@@ -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();

2
forge-game/src/main/java/forge/game/ability/effects/RegenerationEffect.java
View File

@@ -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) {