Fix an issue caused exceptions while obtaining the building's service

dymanoid · Jul 24, 2018 · 8861242 · 8861242
1 parent f7b7ae5
commit 8861242
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/RealTime/GameConnection/BuildingManagerConnection.cs b/src/RealTime/GameConnection/BuildingManagerConnection.cs
@@ -55,7 +55,14 @@ public void GetBuildingService(ushort buildingId, out ItemClass.Service service,
                 return;
             }
 
-            ref ItemClass itemClass = ref BuildingManager.instance.m_buildings.m_buffer[buildingId].Info.m_class;
+            ItemClass itemClass = BuildingManager.instance.m_buildings.m_buffer[buildingId].Info?.m_class;
+            if (itemClass == null)
+            {
+                service = ItemClass.Service.None;
+                subService = ItemClass.SubService.None;
+                return;
+            }
+
             service = itemClass.m_service;
             subService = itemClass.m_subService;
         }