ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug with cards checking if a card was played in phase/turn

Browse Source
This commit is contained in:
marcin.sciesinski
2019-10-03 11:22:25 -07:00
parent d0b438d60a
commit 378d79126f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentPhaseCondition.java
View File

@@ -18,9 +18,11 @@ public class CardPlayedInCurrentPhaseCondition implements Condition {
@Override
public boolean isFullfilled(LotroGame game) {
for (EffectResult effectResult : game.getActionsEnvironment().getPhaseEffectResults()) {
PlayCardResult playResult = (PlayCardResult) effectResult;
if (filter.accepts(game, playResult.getPlayedCard()))
return true;
if (effectResult instanceof PlayCardResult) {
PlayCardResult playResult = (PlayCardResult) effectResult;
if (filter.accepts(game, playResult.getPlayedCard()))
return true;
}
}
return false;

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/condition/CardPlayedInCurrentTurnCondition.java
View File

@@ -18,9 +18,11 @@ public class CardPlayedInCurrentTurnCondition implements Condition {
@Override
public boolean isFullfilled(LotroGame game) {
for (EffectResult effectResult : game.getActionsEnvironment().getTurnEffectResults()) {
PlayCardResult playResult = (PlayCardResult) effectResult;
if (filter.accepts(game, playResult.getPlayedCard()))
return true;
if (effectResult instanceof PlayCardResult) {
PlayCardResult playResult = (PlayCardResult) effectResult;
if (filter.accepts(game, playResult.getPlayedCard()))
return true;
}
}
return false;