Fix static NPCs in houses not being hidden at night

Author: TwelveEyes

Assets/Scripts/Internal/DaggerfallInterior.cs

@@ -5,7 +5,7 @@
 // Source Code:     https://github.com/Interkarma/daggerfall-unity
 // Original Author: Gavin Clayton ([email protected])
 // Contributors:    Nystul, Hazelnut, Numidium, Ferital
-// 
+//
 // Notes:
 //
 
@@ -1202,16 +1202,10 @@ private void AddPeople(PlayerGPS.DiscoveredBuilding buildingData)
                 StaticNPC npc = go.AddComponent<StaticNPC>();
                 npc.SetLayoutData(obj, entryDoor.buildingKey);
 
-                // Disable people if shop or building is closed
                 DFLocation.BuildingTypes buildingType = buildingData.buildingType;
-                if ((RMBLayout.IsShop(buildingType) && !GameManager.Instance.PlayerEnterExit.IsPlayerInsideOpenShop) ||
-                    (buildingType <= DFLocation.BuildingTypes.Palace && !RMBLayout.IsShop(buildingType) 
-                     && !(PlayerActivate.IsBuildingOpen(buildingType) || buildingType == DFLocation.BuildingTypes.GuildHall && guild.HallAccessAnytime())))
-                {
-                    go.SetActive(false);
-                }
+
                 // Disable people if player owns this house
-                else if (DaggerfallBankManager.IsHouseOwned(buildingData.buildingKey))
+                if (DaggerfallBankManager.IsHouseOwned(buildingData.buildingKey))
                 {
                     go.SetActive(false);
                 }
@@ -1220,6 +1214,13 @@ private void AddPeople(PlayerGPS.DiscoveredBuilding buildingData)
                 {
                     go.SetActive(false);
                 }
+                // Disable people if shop or building is closed
+                else if ((RMBLayout.IsShop(buildingType) && !GameManager.Instance.PlayerEnterExit.IsPlayerInsideOpenShop) ||
+                         (buildingType <= DFLocation.BuildingTypes.Town23 && !RMBLayout.IsShop(buildingType)
+                         && !(PlayerActivate.IsBuildingOpen(buildingType) || buildingType == DFLocation.BuildingTypes.GuildHall && guild.HallAccessAnytime())))
+                {
+                    go.SetActive(false);
+                }
                 else
                 {
                     QuestMachine.Instance.SetupIndividualStaticNPC(go, obj.FactionID);
@@ -1264,7 +1265,7 @@ private void AddActionDoors()
                     {
                         boxCollider.center = meshRenderer.bounds.center;
                         boxCollider.size = meshRenderer.bounds.size;
-                    }  
+                    }
 
                     // Update climate
                     DaggerfallMesh dfMesh = go.GetComponent<DaggerfallMesh>();