From 14d40c0f699a2b94b5aa9af5dc21e9de8adb51d4 Mon Sep 17 00:00:00 2001 From: asvitkine Date: Wed, 5 Jul 2023 23:13:35 -0400 Subject: [PATCH] Use getProTerritory() to avoid NPE. --- .../java/games/strategy/triplea/ai/pro/ProNonCombatMoveAi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/ProNonCombatMoveAi.java b/game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/ProNonCombatMoveAi.java index 113003c53d4..81f93f6e295 100644 --- a/game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/ProNonCombatMoveAi.java +++ b/game-app/game-core/src/main/java/games/strategy/triplea/ai/pro/ProNonCombatMoveAi.java @@ -2412,7 +2412,8 @@ public boolean visit(Territory t, int distance) { if (finalDestinationTest.test(t)) { Route r = data.getMap().getRouteForUnit(from, t, canMoveThrough, unit, player); while (r != null && r.hasSteps()) { - if (moveMap.get(r.getEnd()).isCanHold() && validateMove.test(r)) { + final ProTerritory proDestination = proData.getProTerritory(moveMap, r.getEnd()); + if (proDestination.isCanHold() && validateMove.test(r)) { destination.setValue(r.getEnd()); // End the search. return false;