From c21f2203c5ccc3ec8aa6a862424ca751e274a71b Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sat, 21 Jul 2018 18:21:26 +0200 Subject: [PATCH] GameAction: always trigger should not run if used preList --- forge-game/src/main/java/forge/game/GameAction.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 4c39214adbd..e9be359dc27 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -876,7 +876,9 @@ public class GameAction { } } - if (runEvents) { + // preList means that this is run by a pre Check with LKI objects + // in that case Always trigger should not Run + if (preList.isEmpty()) { final Map runParams = Maps.newHashMap(); game.getTriggerHandler().runTrigger(TriggerType.Always, runParams, false); } @@ -1598,7 +1600,7 @@ public class GameAction { if (landCount == 0 ){ return 0; } - return new Float(landCount)/new Float(deck.size()); + return Float.valueOf(landCount)/Float.valueOf(deck.size()); } private float getHandScore(List hand, float landRatio){