diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index bceeea45b97..f4bb30e4535 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java @@ -712,7 +712,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect { } List movedCards; - if (decider.isHuman()) { + if (decider.getLobbyPlayer().isHuman()) { movedCards = changeHiddenOriginResolveHuman(decider, sa, player, changeNum, origin, destination, fetchList, libraryPos); } else { movedCards = hiddenOriginResolveAI(decider, sa, player, changeNum, origin, destination, fetchList, libraryPos); diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 7091bf7137e..91589788654 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -247,9 +247,6 @@ public class Player extends GameEntity implements Comparable { return teamNumber; } - @Deprecated - public boolean isHuman() { return getLobbyPlayer().isHuman(); } - public boolean isArchenemy() { //Only the archenemy has schemes. diff --git a/forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java index d863b7e9ca4..d81354aabdd 100644 --- a/forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java @@ -1081,14 +1081,12 @@ public class PlayerControllerHuman extends PlayerController { @Override public boolean payManaCost(CostPartMana costPartMana, PaymentDecision pd, SpellAbility sa) { - // TODO Auto-generated method stub ManaCost toPay; - if ( costPartMana.isExiledCreatureCost() ) + if ( costPartMana.isExiledCreatureCost() ) // back from the brink toPay = sa.getPaidList("Exiled").get(0).getManaCost(); else toPay = costPartMana.getManaToPay(); - return HumanPlay.payManaCost(toPay, costPartMana, sa, player); }