From ab9dea69306848f0562bdf54a48de7eb1f0b978c Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sat, 5 Aug 2017 11:50:54 +0000
Subject: [PATCH] - Fixed Challenge achievements being awarded in Puzzle Mode.

---
 .../main/java/forge/achievement/ChallengeAchievements.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java b/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java
index aa96d01a15c..0970a6c222d 100644
--- a/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java
+++ b/forge-gui/src/main/java/forge/achievement/ChallengeAchievements.java
@@ -56,8 +56,9 @@ public class ChallengeAchievements extends AchievementCollection {
 
         @Override
         protected final boolean eval(Player player, Game game) {
-            if (game.getRules().hasAppliedVariant(GameType.MomirBasic)) {
-                // Momir Basic uses a fixed pre-defined deck format (all lands), so designing it to be that way is not the player's achievement
+            if (game.getRules().hasAppliedVariant(GameType.MomirBasic)
+                    || game.getRules().hasAppliedVariant(GameType.Puzzle)) {
+                // these modes use a fixed pre-defined deck format, so challenge achievements don't apply in them
                 return false;
             }
             if (player.getOutcome().hasWon()) {