From d7d20925f311364a2c41d8fc403c9170f9de19c2 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Fri, 19 Sep 2014 21:52:21 +0000
Subject: [PATCH] Tweak previous fix

---
 .../src/main/java/forge/game/player/PlayerController.java     | 4 ----
 .../main/java/forge/achievement/AchievementCollection.java    | 2 --
 .../src/main/java/forge/player/PlayerControllerHuman.java     | 3 ++-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/player/PlayerController.java b/forge-game/src/main/java/forge/game/player/PlayerController.java
index d41f66164ab..b8c37d9ee60 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerController.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerController.java
@@ -291,8 +291,4 @@ public abstract class PlayerController {
     public boolean canPlayUnlimitedLands() {
         return false;
     }
-
-    public boolean hasCheated() {
-        return false;
-    }
 }
\ No newline at end of file
diff --git a/forge-gui/src/main/java/forge/achievement/AchievementCollection.java b/forge-gui/src/main/java/forge/achievement/AchievementCollection.java
index cee1371bacb..4d5c875f63e 100644
--- a/forge-gui/src/main/java/forge/achievement/AchievementCollection.java
+++ b/forge-gui/src/main/java/forge/achievement/AchievementCollection.java
@@ -73,8 +73,6 @@ public abstract class AchievementCollection implements Iterable<Achievement> {
     }
 
     public void updateAll(IGuiBase gui, Player player) {
-        if (player.getController().hasCheated()) { return; } //don't update achievements if player cheated during game
-
         for (Achievement achievement : achievements.values()) {
             achievement.update(gui, player);
         }
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index 696cc5c0694..970e587a573 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -1344,6 +1344,8 @@ public class PlayerControllerHuman extends PlayerController {
         }
 
         public void updateAchievements() {
+            if (hasCheated()) { return; } //don't update achievements if player cheated during game
+
             //update all achievements for GUI player after game finished
             ThreadUtil.invokeInGameThread(new Runnable() {
                 @Override
@@ -1694,7 +1696,6 @@ public class PlayerControllerHuman extends PlayerController {
         }
         return cheats;
     }
-    @Override
     public boolean hasCheated() {
         return cheats != null;
     }