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

Fix copied SA using old replacingObjects

Browse Source
This commit is contained in:
tool4EvEr
2025-09-18 21:01:42 +02:00
committed by Hans Mackowiak
parent 398917d010
commit 9b8020bb30
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java
View File

@@ -92,14 +92,13 @@ public class SacrificeEffect extends SpellAbilityEffect {
CardZoneTable zoneMovements = AbilityKey.addCardZoneTableParams(params, sa); CardZoneTable zoneMovements = AbilityKey.addCardZoneTableParams(params, sa);
if (valid.equals("Self") && game.getZoneOf(host) != null) { if (valid.equals("Self") && game.getZoneOf(host) != null) {
if (host.getController().equals(activator) && game.getZoneOf(host).is(ZoneType.Battlefield)) { if (host.getController().equals(activator) && game.getZoneOf(host).is(ZoneType.Battlefield) &&
if (!optional || activator.getController().confirmAction(sa, null, (!optional || activator.getController().confirmAction(sa, null,
Localizer.getInstance().getMessage("lblDoYouWantSacrificeThis", host.getName()), null)) { Localizer.getInstance().getMessage("lblDoYouWantSacrificeThis", host.getName()), null))) {
if (game.getAction().sacrifice(new CardCollection(host), sa, true, params) != null && remSacrificed) { if (game.getAction().sacrifice(new CardCollection(host), sa, true, params) != null && remSacrificed) {
host.addRemembered(host); host.addRemembered(host);
} }
} }
}
} else { } else {
CardCollectionView choosenToSacrifice = null; CardCollectionView choosenToSacrifice = null;
for (final Player p : getTargetPlayers(sa)) { for (final Player p : getTargetPlayers(sa)) {

3
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -1248,6 +1248,9 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
clone.mayChooseNewTargets = false; clone.mayChooseNewTargets = false;
clone.triggeringObjects = AbilityKey.newMap(this.triggeringObjects); clone.triggeringObjects = AbilityKey.newMap(this.triggeringObjects);
if (!lki) {
clone.replacingObjects = AbilityKey.newMap();
}
clone.setPayCosts(getPayCosts().copy()); clone.setPayCosts(getPayCosts().copy());
if (manaPart != null) { if (manaPart != null) {