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

HumanPlaySpellAbility: fix CastSA and CastFrom reset when ability is canceld

Browse Source
This commit is contained in:
Hans Mackowiak
2020-02-14 14:01:16 +00:00
committed by Michael Kamensky
parent 4192d56909
commit 93ae66ad39
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
View File

@@ -133,8 +133,8 @@ public class HumanPlaySpellAbility {
}
if (ability.isAbility() && ability instanceof AbilityActivated) {
final Map<String, String> params = Maps.newHashMap();
params.put("ManaColorConversion", "Additive");
final Map<String, String> params = Maps.newHashMap();
params.put("ManaColorConversion", "Additive");
for (KeywordInterface inst : c.getKeywords()) {
String keyword = inst.getOriginal();
@@ -249,6 +249,8 @@ public class HumanPlaySpellAbility {
final Game game = ability.getActivatingPlayer().getGame();
if (fromZone != null) { // and not a copy
ability.getHostCard().setCastSA(null);
ability.getHostCard().setCastFrom(null);
// add back to where it came from
game.getAction().moveTo(fromZone, ability.getHostCard(), zonePosition >= 0 ? Integer.valueOf(zonePosition) : null, null);
}