From ec5bfe97fb7e42134d6509eea3ee0dda2985f25c Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 15 Nov 2011 20:44:28 +0000 Subject: [PATCH] If resolving skirmish if fellowship character is removed, it should not freeze the game. --- .../gempukku/lotro/logic/effects/ResolveSkirmishEffect.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ResolveSkirmishEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ResolveSkirmishEffect.java index 45e4c9434..98065ca80 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ResolveSkirmishEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/ResolveSkirmishEffect.java @@ -46,7 +46,9 @@ public class ResolveSkirmishEffect extends AbstractEffect { final PhysicalCard fellowshipCharacter = _skirmish.getFellowshipCharacter(); - int multiplier = game.getModifiersQuerying().getOverwhelmMultiplier(game.getGameState(), fellowshipCharacter); + int multiplier = 2; + if (fellowshipCharacter != null) + multiplier = game.getModifiersQuerying().getOverwhelmMultiplier(game.getGameState(), fellowshipCharacter); if (fpStrength * multiplier <= shadowStrength && shadowStrength != 0) { return Result.FELLOWSHIP_OVERWHELMED;