From f9150bea34f9564284ef076c3e4748b31846dcaa Mon Sep 17 00:00:00 2001 From: tool4ever Date: Wed, 15 Oct 2025 11:30:41 +0200 Subject: [PATCH] Fix Bitterbloom Bearer (#8932) --- .../main/java/forge/game/ability/effects/MutateEffect.java | 2 +- forge-game/src/main/java/forge/game/zone/Zone.java | 3 +-- forge-gui/res/cardsfolder/upcoming/bitterbloom_bearer.txt | 4 ++-- forge-gui/res/tokenscripts/ub_1_1_faerie_flying.txt | 7 +++++++ 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 forge-gui/res/tokenscripts/ub_1_1_faerie_flying.txt diff --git a/forge-game/src/main/java/forge/game/ability/effects/MutateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MutateEffect.java index 4cf4203da68..3500663e6cf 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MutateEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/MutateEffect.java @@ -80,7 +80,7 @@ public class MutateEffect extends SpellAbilityEffect { game.getTriggerHandler().clearActiveTriggers(target, null); game.getTriggerHandler().registerActiveTrigger(target, false); - game.getAction().moveTo(p.getZone(ZoneType.Merged), host, sa, AbilityKey.newMap()); + game.getAction().moveTo(p.getZone(ZoneType.Merged), host, sa); host.setTapped(target.isTapped()); host.setFlipped(target.isFlipped()); diff --git a/forge-game/src/main/java/forge/game/zone/Zone.java b/forge-game/src/main/java/forge/game/zone/Zone.java index 5d57174a4db..04d17364f3c 100644 --- a/forge-game/src/main/java/forge/game/zone/Zone.java +++ b/forge-game/src/main/java/forge/game/zone/Zone.java @@ -111,8 +111,7 @@ public class Zone implements java.io.Serializable, Iterable { final Zone oldZone = game.getZoneOf(c); final ZoneType zt = oldZone == null ? ZoneType.Stack : oldZone.getZoneType(); - // only if the zoneType differs from this - // don't go in there is its a control change + // don't go in there if its a control change if (zt != zoneType) { c.setTurnInController(getPlayer()); c.setTurnInZone(game.getPhaseHandler().getTurn()); diff --git a/forge-gui/res/cardsfolder/upcoming/bitterbloom_bearer.txt b/forge-gui/res/cardsfolder/upcoming/bitterbloom_bearer.txt index 890ac68bffd..a0a74d7de4f 100644 --- a/forge-gui/res/cardsfolder/upcoming/bitterbloom_bearer.txt +++ b/forge-gui/res/cardsfolder/upcoming/bitterbloom_bearer.txt @@ -4,9 +4,9 @@ Types:Creature Faerie Rogue PT:1/1 K:Flash K:Flying -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, you lose 1 life and create a 1/1 black Faerie Rogue creature token with flying. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, you lose 1 life and create a 1/1 black Faerie creature token with flying. SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 1 | SubAbility$ DBToken -SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ ub_1_1_faerie_rogue_flying | TokenOwner$ You +SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ ub_1_1_faerie_flying | TokenOwner$ You SVar:AICastPreference:NeverCastIfLifeBelow$ 4 DeckHas:Ability$Token Oracle:Flash\nFlying\nAt the beginning of your upkeep, you lose 1 life and create a 1/1 blue and black Faerie creature token with flying. diff --git a/forge-gui/res/tokenscripts/ub_1_1_faerie_flying.txt b/forge-gui/res/tokenscripts/ub_1_1_faerie_flying.txt new file mode 100644 index 00000000000..cc6178832c9 --- /dev/null +++ b/forge-gui/res/tokenscripts/ub_1_1_faerie_flying.txt @@ -0,0 +1,7 @@ +Name:Faerie Token +ManaCost:no cost +Colors:blue,black +Types:Creature Faerie +PT:1/1 +K:Flying +Oracle:Flying