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

- "Rallying Call" should no longer cause the game to crash, if an FP character dies and there were threats.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-09-25 16:01:18 +00:00
parent b82f95372b
commit 57d059ff58
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java
View File

@@ -43,7 +43,7 @@ public class KillEffect extends AbstractSuccessfulEffect {
public List<PhysicalCard> getCharactersToBeKilled() { public List<PhysicalCard> getCharactersToBeKilled() {
List<PhysicalCard> result = new LinkedList<PhysicalCard>(); List<PhysicalCard> result = new LinkedList<PhysicalCard>();
for (PhysicalCard card : _cards) { for (PhysicalCard card : _cards) {
if (card.getZone().isInPlay()) if (card.getZone() != null && card.getZone().isInPlay())
result.add(card); result.add(card);
} }

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveThreatsEffect.java
View File

@@ -31,7 +31,7 @@ public class RemoveThreatsEffect extends AbstractEffect {
@Override @Override
protected FullEffectResult playEffectReturningResult(LotroGame game) { protected FullEffectResult playEffectReturningResult(LotroGame game) {
if (game.getModifiersQuerying().canRemoveThreat(game.getGameState(), _source)) { if (_source == null || game.getModifiersQuerying().canRemoveThreat(game.getGameState(), _source)) {
int toRemove = Math.min(game.getGameState().getThreats(), _count); int toRemove = Math.min(game.getGameState().getThreats(), _count);
if (toRemove > 0) { if (toRemove > 0) {

1
gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
View File

@@ -3,6 +3,7 @@
- "Elven Armaments" now prevents only the FP player from using the Archery special abilities. - "Elven Armaments" now prevents only the FP player from using the Archery special abilities.
- "Whatever Means" should now work correctly in cases, when burdens cannot be removed. - "Whatever Means" should now work correctly in cases, when burdens cannot be removed.
- "Sword of Minas Morgul" should now correctly discard the possession from character in the skirmish. - "Sword of Minas Morgul" should now correctly discard the possession from character in the skirmish.
- "Rallying Call" should no longer cause the game to crash, if an FP character dies and there were threats.
<b>20 Sep. 2012</b> <b>20 Sep. 2012</b>
- "Rallying Call" should now correctly prevent removal of threats by FP cards. - "Rallying Call" should now correctly prevent removal of threats by FP cards.