From deb8f4dc8610ece3edc2b320de2fd89a8ede159f Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Sun, 15 Dec 2024 19:55:47 -0600
Subject: [PATCH] Various fixes

- Fixing V2 Uruk Shield Wall blocking skirmish wounds
- Fixing Denethor errata still being strength 5
- Fixing NRE for a certain card lookup
---
 .../pc/errata/set10/set10-Gondor-errata.hjson |  2 +-
 .../unofficial/pc/setV02/V2-Isengard.hjson    | 29 ++++++++++++-------
 .../lotro/game/LotroCardBlueprintLibrary.java |  3 ++
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Gondor-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Gondor-errata.hjson
index d69ee3db3..d763f9c36 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Gondor-errata.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set10/set10-Gondor-errata.hjson
@@ -15,7 +15,7 @@
 		twilight: 2
 		type: Companion
 		race: Man
-		strength: 5
+		strength: 8
 		vitality: 3
 		signet: Aragorn
 		resistance: 6
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson
index 978c1b2e5..c2cf28137 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson
@@ -1142,18 +1142,27 @@
 					filter: uruk-hai
 					memorize: woundedUruk
 				}
-				requires: {
-					type: IsEqual
-					firstNumber: {
-						type: TwilightCostInMemory
-						memory: woundedUruk
+				requires: [
+					{
+						type: IsEqual
+						firstNumber: {
+							type: TwilightCostInMemory
+							memory: woundedUruk
+						}
+						secondNumber: {
+							type: ForEachCultureToken
+							filter: self
+							culture: isengard
+						}
 					}
-					secondNumber: {
-						type: ForEachCultureToken
-						filter: self
-						culture: isengard
+					{
+						type: not
+						requires: {
+							type: phase
+							phase: skirmish
+						}
 					}
-				}
+				]
 				effect: [
 					{
 						type: PreventWound
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
index e952c5987..213197af6 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
@@ -390,6 +390,9 @@ public class LotroCardBlueprintLibrary {
 
             collectionReady.release();
 
+            if(bp == null)
+                throw new CardNotFoundException(blueprintId + " was somehow null");
+
             return bp;
         } catch (InterruptedException exp) {
             throw new RuntimeException("LotroCardBlueprintLibrary.getLotroCardBlueprint() interrupted: ", exp);