external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'alwaysTriggerFix' into 'master'

Browse Source 
GameAction: always trigger should not run if used preList

Closes #617

See merge request core-developers/forge!789
This commit is contained in:
Michael Kamensky
2018-07-21 17:59:22 +00:00
parent 7d56940384 c21f2203c5
commit 483a01b936
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -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<String, Object> runParams = Maps.newHashMap(); final Map<String, Object> runParams = Maps.newHashMap();
game.getTriggerHandler().runTrigger(TriggerType.Always, runParams, false); game.getTriggerHandler().runTrigger(TriggerType.Always, runParams, false);
} }
@@ -1598,7 +1600,7 @@ public class GameAction {
if (landCount == 0 ){ if (landCount == 0 ){
return 0; return 0;
} }
return new Float(landCount)/new Float(deck.size()); return Float.valueOf(landCount)/Float.valueOf(deck.size());
} }
private float getHandScore(List<Card> hand, float landRatio){ private float getHandScore(List<Card> hand, float landRatio){