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

ChangeZoneEffect: fold "NewController" into "GainControl"

Browse Source
This commit is contained in:
Northmoc
2022-05-20 20:04:08 -04:00
parent eebb1b1d37
commit 8c95e15b74
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -619,10 +619,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
gameCard.addEtbCounter(cType, cAmount, player); gameCard.addEtbCounter(cType, cAmount, player);
} }
if (sa.hasParam("GainControl")) { if (sa.hasParam("GainControl")) {
Player newController = player; final String g = sa.getParam("GainControl");
if (sa.hasParam("NewController")) { Player newController = g.equals("True") ? sa.getActivatingPlayer() :
newController = Iterables.getFirst(AbilityUtils.getDefinedPlayers(hostCard, sa.getParam("NewController"), sa), null); AbilityUtils.getDefinedPlayers(sa.getHostCard(), g, sa).get(0);
}
if (newController != null) { if (newController != null) {
if (newController != gameCard.getController()) { if (newController != gameCard.getController()) {
gameCard.runChangeControllerCommands(); gameCard.runChangeControllerCommands();
@@ -1279,10 +1278,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
source.removeRemembered(c); source.removeRemembered(c);
} }
if (sa.hasParam("GainControl")) { if (sa.hasParam("GainControl")) {
Player newController = sa.getActivatingPlayer(); final String g = sa.getParam("GainControl");
if (sa.hasParam("NewController")) { Player newController = g.equals("True") ? sa.getActivatingPlayer() :
newController = AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("NewController"), sa).get(0); AbilityUtils.getDefinedPlayers(sa.getHostCard(), g, sa).get(0);
}
if (newController != c.getController()) { if (newController != c.getController()) {
c.runChangeControllerCommands(); c.runChangeControllerCommands();
} }