diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index ede54561c78..12e9f5a540a 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -14299,10 +14299,12 @@ public class CardFactory implements NewConstants { public void resolve() { AllZone.GameAction.getPlayerLife(getTargetPlayer()).setLife(0); - int gameNumber = 0; - if (Constant.Runtime.WinLose.getWin()==1) - gameNumber = 1; - Constant.Runtime.WinLose.setWinMethod(gameNumber,"Door to Nothingness"); + if (getTargetPlayer().equals(Constant.Player.Computer)) { + int gameNumber = 0; + if (Constant.Runtime.WinLose.getWin()==1) + gameNumber = 1; + Constant.Runtime.WinLose.setWinMethod(gameNumber,"Door to Nothingness"); + } } @Override diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index b33ea589b77..3e5547cebb8 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -448,6 +448,7 @@ public class GameAction { if (AllZone.Computer_PoisonCounter.getPoisonCounters() >= 10) { int gameNumber = 0; + if (Constant.Runtime.WinLose.getWin() == 1) gameNumber = 1; Constant.Runtime.WinLose.setWinMethod(gameNumber, "Poison Counters"); diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 5f212ba633f..81caf695738 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -6623,10 +6623,12 @@ public class GameActionUtil { String opponent = AllZone.GameAction.getOpponent(player); PlayerLife life = AllZone.GameAction.getPlayerLife(opponent); - int gameNumber = 0; - if (Constant.Runtime.WinLose.getWin()==1) - gameNumber = 1; - Constant.Runtime.WinLose.setWinMethod(gameNumber,"Felidar Sovereign"); + if (opponent.equals(Constant.Player.Computer)) { + int gameNumber = 0; + if (Constant.Runtime.WinLose.getWin()==1) + gameNumber = 1; + Constant.Runtime.WinLose.setWinMethod(gameNumber,"Felidar Sovereign"); + } life.setLife(0); } };// Ability @@ -6651,10 +6653,12 @@ public class GameActionUtil { String opponent = AllZone.GameAction.getOpponent(player); PlayerLife life = AllZone.GameAction.getPlayerLife(opponent); - int gameNumber = 0; - if (Constant.Runtime.WinLose.getWin()==1) - gameNumber = 1; - Constant.Runtime.WinLose.setWinMethod(gameNumber,"Battle of Wits"); + if (opponent.equals(Constant.Player.Computer)) { + int gameNumber = 0; + if (Constant.Runtime.WinLose.getWin()==1) + gameNumber = 1; + Constant.Runtime.WinLose.setWinMethod(gameNumber,"Battle of Wits"); + } life.setLife(0); } @@ -6682,11 +6686,12 @@ public class GameActionUtil { String opponent = AllZone.GameAction.getOpponent(player); PlayerLife life = AllZone.GameAction.getPlayerLife(opponent); - int gameNumber = 0; - if (Constant.Runtime.WinLose.getWin()==1) - gameNumber = 1; - Constant.Runtime.WinLose.setWinMethod(gameNumber,"Epic Struggle"); - + if (opponent.equals(Constant.Player.Computer)) { + int gameNumber = 0; + if (Constant.Runtime.WinLose.getWin()==1) + gameNumber = 1; + Constant.Runtime.WinLose.setWinMethod(gameNumber,"Epic Struggle"); + } life.setLife(0); } };// Ability @@ -6709,10 +6714,12 @@ public class GameActionUtil { @Override public void resolve() { - int gameNumber = 0; - if (Constant.Runtime.WinLose.getWin()==1) - gameNumber = 1; - Constant.Runtime.WinLose.setWinMethod(gameNumber,"Helix Pinnacle"); + if (AllZone.GameAction.getOpponent(player).equals(Constant.Player.Computer)) { + int gameNumber = 0; + if (Constant.Runtime.WinLose.getWin()==1) + gameNumber = 1; + Constant.Runtime.WinLose.setWinMethod(gameNumber,"Helix Pinnacle"); + } AllZone.GameAction.getPlayerLife(AllZone.GameAction.getOpponent(player)) .setLife(0); } @@ -6739,10 +6746,12 @@ public class GameActionUtil { String opponent = AllZone.GameAction.getOpponent(player); PlayerLife oppLife = AllZone.GameAction.getPlayerLife(opponent); - int gameNumber = 0; - if (Constant.Runtime.WinLose.getWin()==1) - gameNumber = 1; - Constant.Runtime.WinLose.setWinMethod(gameNumber,"Near-Death Experience"); + if (opponent.equals(Constant.Player.Computer)) { + int gameNumber = 0; + if (Constant.Runtime.WinLose.getWin()==1) + gameNumber = 1; + Constant.Runtime.WinLose.setWinMethod(gameNumber,"Near-Death Experience"); + } oppLife.setLife(0); } @@ -6775,12 +6784,13 @@ public class GameActionUtil { public void resolve() { String opponent = AllZone.GameAction.getOpponent(player); PlayerLife life = AllZone.GameAction.getPlayerLife(opponent); - - int gameNumber = 0; - if (Constant.Runtime.WinLose.getWin()==1) - gameNumber = 1; - Constant.Runtime.WinLose.setWinMethod(gameNumber,"Barren Glory"); - + + if (opponent.equals(Constant.Player.Computer)) { + int gameNumber = 0; + if (Constant.Runtime.WinLose.getWin()==1) + gameNumber = 1; + Constant.Runtime.WinLose.setWinMethod(gameNumber,"Barren Glory"); + } life.setLife(0); } };// Ability