diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 2bb33c8c956..5957b87690c 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -4744,7 +4744,8 @@ public class GameActionUtil { }; // ability2 ability2.setStackDescription("Guilty Conscience deals " + damage + " damage to " + c.getName()); - AllZone.Stack.add(ability2); + if (damage >= 0) + AllZone.Stack.add(ability2); } public static void executeGuiltyConscienceEffects(Card c, Card source, int n) { diff --git a/src/forge/Gui_WinLose.java b/src/forge/Gui_WinLose.java index bd5370534bb..92df59974f8 100644 --- a/src/forge/Gui_WinLose.java +++ b/src/forge/Gui_WinLose.java @@ -150,7 +150,7 @@ public class Gui_WinLose extends JFrame implements NewConstants { if (turn < 1) turn = 1; - winLose.setWinTurn(game, AllZone.Phase.getTurn()); + winLose.setWinTurn(game, turn); winLose.setMulliganedToZero(game, AllZone.GameInfo.getHumanMulliganedToZero()); //winLose.setWinTurn(winLose.countWinLose()-1, AllZone.Phase.getTurn());