From ff0efd17685b49f90302a25dd24548f133d7d27f Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 8 Dec 2020 11:20:14 -0500
Subject: [PATCH] Core/Scenario: Fix loading ScenarioPOI

---
 Source/Game/Scenarios/ScenarioManager.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/Game/Scenarios/ScenarioManager.cs b/Source/Game/Scenarios/ScenarioManager.cs
index 7ac0334c4..a0e3a070d 100644
--- a/Source/Game/Scenarios/ScenarioManager.cs
+++ b/Source/Game/Scenarios/ScenarioManager.cs
@@ -167,7 +167,7 @@ namespace Game.Scenarios
             if (!points.IsEmpty())
             {
                 // The first result should have the highest criteriaTreeId
-                uint criteriaTreeIdMax = result.Read<uint>(0);
+                uint criteriaTreeIdMax = points.Read<uint>(0);
                 POIs = new List<Vector2>[criteriaTreeIdMax + 1][];
 
                 do
@@ -177,9 +177,12 @@ namespace Game.Scenarios
                     int X = points.Read<int>(2);
                     int Y = points.Read<int>(3);
 
-                    if (POIs[CriteriaTreeID].Length <= Idx1 + 1)
+                    if (POIs[CriteriaTreeID] == null)
                         POIs[CriteriaTreeID] = new List<Vector2>[Idx1 + 10];
 
+                    if (POIs[CriteriaTreeID][Idx1] == null)
+                        POIs[CriteriaTreeID][Idx1] = new List<Vector2>();
+
                     POIs[CriteriaTreeID][Idx1].Add(new Vector2(X, Y));
                 } while (points.NextRow());
             }