From 78e5901c9384a574b8ca6fac50b503203094c4fc Mon Sep 17 00:00:00 2001
From: AureumApes <aureumapes@duck.com>
Date: Mon, 25 Dec 2023 01:33:34 +0100
Subject: [PATCH]  Fix a commonly reported bug, which caused falling through
 map

---
 SRMP/Patches/Patch_Region.cs | 170 +++++++++++++++++++++++++++++++++++
 SRMP/SRMP.cs                 | 163 ---------------------------------
 2 files changed, 170 insertions(+), 163 deletions(-)

diff --git a/SRMP/Patches/Patch_Region.cs b/SRMP/Patches/Patch_Region.cs
index e5183ac..7c7dee2 100644
--- a/SRMP/Patches/Patch_Region.cs
+++ b/SRMP/Patches/Patch_Region.cs
@@ -4,6 +4,7 @@ using SRMultiplayer.Networking;
 using SRMultiplayer.Packets;
 using System;
 using System.Collections.Generic;
+
 using System.Linq;
 using System.Text;
 using UnityEngine;
@@ -38,6 +39,175 @@ namespace SRMultiplayer.Patches
             }
         }
     }
+    [HarmonyPatch(typeof(Region))]
+    [HarmonyPatch("Awake")]
+    class Region_Awake
+    {
+        static void Postfix(Region __instance)
+        {
+            var netRegion = __instance.gameObject.AddComponent<NetworkRegion>();
+            netRegion.ID = __instance.gameObject.GetGameObjectPath().GetHashCode();
+            netRegion.Region = __instance;
+            netRegion.FastForwarder = __instance.gameObject.GetComponent<RanchCellFastForwarder>();
+
+            Globals.Regions.Add(netRegion.ID, netRegion);
+
+
+            foreach (var landPlotLocation in __instance.gameObject.GetComponentsInChildren<LandPlotLocation>(true))
+            {
+                var netLandplot = landPlotLocation.gameObject.GetOrAddComponent<NetworkLandplot>();
+                netLandplot.Plot = landPlotLocation.GetComponentInChildren<LandPlot>(true);
+                netLandplot.Location = landPlotLocation;
+                netLandplot.Region = netRegion;
+
+                Globals.LandPlots.Add(netLandplot.Location.id, netLandplot);
+            }
+
+            foreach (var accessDoor in __instance.gameObject.GetComponentsInChildren<AccessDoor>(true))
+            {
+                var netAccessDoor = accessDoor.gameObject.GetOrAddComponent<NetworkAccessDoor>();
+                netAccessDoor.Door = accessDoor;
+                netAccessDoor.Region = netRegion;
+
+                Globals.AccessDoors.Add(accessDoor.id, netAccessDoor);
+            }
+
+            foreach (var gordo in __instance.gameObject.GetComponentsInChildren<GordoEat>(true))
+            {
+                var netGordo = gordo.gameObject.GetOrAddComponent<NetworkGordo>();
+                netGordo.Gordo = gordo;
+                netGordo.Region = netRegion;
+
+                Globals.Gordos.Add(netGordo.ID, netGordo);
+            }
+
+            foreach (var puzzleSlot in __instance.gameObject.GetComponentsInChildren<PuzzleSlot>(true))
+            {
+                var netPuzzleSlot = puzzleSlot.gameObject.GetOrAddComponent<NetworkPuzzleSlot>();
+                netPuzzleSlot.Slot = puzzleSlot;
+                netPuzzleSlot.Region = netRegion;
+
+                Globals.PuzzleSlots.Add(puzzleSlot.id, netPuzzleSlot);
+            }
+
+            foreach (var masterSwitch in __instance.gameObject.GetComponentsInChildren<WorldStateMasterSwitch>(true))
+            {
+                var netSwitch = masterSwitch.gameObject.GetOrAddComponent<NetworkWorldStateMasterSwitch>();
+                netSwitch.Switch = masterSwitch;
+                netSwitch.Region = netRegion;
+
+                Globals.Switches.Add(masterSwitch.id, netSwitch);
+            }
+
+            foreach (var gadgetSite in __instance.gameObject.GetComponentsInChildren<GadgetSite>(true))
+            {
+                var netGadgetSite = gadgetSite.gameObject.GetOrAddComponent<NetworkGadgetSite>();
+                netGadgetSite.Site = gadgetSite;
+                netGadgetSite.Region = netRegion;
+
+                Globals.GadgetSites.Add(gadgetSite.id, netGadgetSite);
+            }
+
+            foreach (var treaturePod in __instance.gameObject.GetComponentsInChildren<TreasurePod>(true))
+            {
+                var netTreasurePod = treaturePod.gameObject.GetOrAddComponent<NetworkTreasurePod>();
+                netTreasurePod.Pod = treaturePod;
+                netTreasurePod.Region = netRegion;
+
+                Globals.TreasurePods.Add(treaturePod.id, netTreasurePod);
+            }
+
+            foreach (var spawner in __instance.gameObject.GetComponentsInChildren<DirectedActorSpawner>(true))
+            {
+                var netSpawner = spawner.gameObject.GetOrAddComponent<NetworkDirectedActorSpawner>();
+                netSpawner.ID = spawner.gameObject.GetGameObjectPath().GetHashCode();
+                netSpawner.Spawner = spawner;
+                netSpawner.Region = netRegion;
+
+                Globals.Spawners.Add(netSpawner.ID, netSpawner);
+            }
+
+            foreach (var exchangeAcceptor in __instance.gameObject.GetComponentsInChildren<ExchangeAcceptor>(true))
+            {
+                var netAcceptor = exchangeAcceptor.gameObject.GetOrAddComponent<NetworkExchangeAcceptor>();
+                netAcceptor.ID = exchangeAcceptor.gameObject.GetGameObjectPath().GetHashCode();
+                netAcceptor.Acceptor = exchangeAcceptor;
+                netAcceptor.Region = netRegion;
+
+                Globals.ExchangeAcceptors.Add(netAcceptor.ID, netAcceptor);
+            }
+
+            foreach (var fireColumn in __instance.gameObject.GetComponentsInChildren<FireColumn>(true))
+            {
+                var netColumn = fireColumn.gameObject.GetOrAddComponent<NetworkFireColumn>();
+                netColumn.ID = fireColumn.gameObject.GetGameObjectPath().GetHashCode();
+                netColumn.Column = fireColumn;
+                netColumn.Region = netRegion;
+
+                Globals.FireColumns.Add(netColumn.ID, netColumn);
+            }
+
+            foreach (var kookadobaPatchNode in __instance.gameObject.GetComponentsInChildren<KookadobaPatchNode>(true))
+            {
+                var netNode = kookadobaPatchNode.gameObject.GetOrAddComponent<NetworkKookadobaPatchNode>();
+                netNode.ID = kookadobaPatchNode.gameObject.GetGameObjectPath().GetHashCode();
+                netNode.Node = kookadobaPatchNode;
+                netNode.Region = netRegion;
+
+                Globals.Kookadobas.Add(netNode.ID, netNode);
+            }
+
+            foreach (var nutcracker in __instance.gameObject.GetComponentsInChildren<Nutcracker>(true))
+            {
+                var netCracker = nutcracker.gameObject.GetOrAddComponent<NetworkNutcracker>();
+                netCracker.ID = nutcracker.gameObject.GetGameObjectPath().GetHashCode();
+                netCracker.Cracker = nutcracker;
+
+                Globals.Nutcrackers.Add(netCracker.ID, netCracker);
+            }
+
+            foreach (var trigger in __instance.gameObject.GetComponentsInChildren<QuicksilverAmmoReplacer>(true))
+            {
+                var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
+                netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
+                netTrigger.Ammo = trigger;
+
+                Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
+            }
+
+            foreach (var trigger in __instance.gameObject.GetComponentsInChildren<QuicksilverEnergyCheckpoint>(true))
+            {
+                var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
+                netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
+                netTrigger.Checkpoint = trigger;
+
+                Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
+            }
+
+            foreach (var trigger in __instance.gameObject.GetComponentsInChildren<QuicksilverEnergyReplacer>(true))
+            {
+                var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
+                netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
+                netTrigger.Energy = trigger;
+
+                Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
+            }
+
+            foreach (var spawnResource in __instance.gameObject.GetComponentsInChildren<SpawnResource>(true))
+            {
+                var netSpawnResource = spawnResource.gameObject.GetOrAddComponent<NetworkSpawnResource>();
+                netSpawnResource.ID = spawnResource.gameObject.GetGameObjectPath().GetHashCode();
+                netSpawnResource.SpawnResource = spawnResource;
+                netSpawnResource.Region = netRegion;
+                netSpawnResource.LandPlot = spawnResource.GetComponentInParent<NetworkLandplot>(true);
+
+                if (!Globals.SpawnResources.ContainsKey(netSpawnResource.ID))
+                {
+                    Globals.SpawnResources.Add(netSpawnResource.ID, netSpawnResource);
+                }
+            }
+        }
+    }
 
     [HarmonyPatch(typeof(Region))]
     [HarmonyPatch("Unproxy")]
diff --git a/SRMP/SRMP.cs b/SRMP/SRMP.cs
index 7cb7b5c..dc2132a 100644
--- a/SRMP/SRMP.cs
+++ b/SRMP/SRMP.cs
@@ -215,169 +215,6 @@ namespace SRMultiplayer
             Globals.FXPrefabs.Add(splashOnTrigger.playerSplashFX.name, splashOnTrigger.playerSplashFX);
             Globals.FXPrefabs.Add(splashOnTrigger.splashFX.name, splashOnTrigger.splashFX);
 
-            foreach (var region in Resources.FindObjectsOfTypeAll<Region>())
-            {
-                var netRegion = region.gameObject.AddComponent<NetworkRegion>();
-                netRegion.ID = region.gameObject.GetGameObjectPath().GetHashCode();
-                netRegion.Region = region;
-                netRegion.FastForwarder = region.gameObject.GetComponent<RanchCellFastForwarder>();
-
-                Globals.Regions.Add(netRegion.ID, netRegion);
-
-                foreach(var landPlotLocation in region.gameObject.GetComponentsInChildren<LandPlotLocation>(true))
-                {
-                    var netLandplot = landPlotLocation.gameObject.GetOrAddComponent<NetworkLandplot>();
-                    netLandplot.Plot = landPlotLocation.GetComponentInChildren<LandPlot>(true);
-                    netLandplot.Location = landPlotLocation;
-                    netLandplot.Region = netRegion;
-
-                    Globals.LandPlots.Add(netLandplot.Location.id, netLandplot);
-                }
-
-                foreach (var accessDoor in region.gameObject.GetComponentsInChildren<AccessDoor>(true))
-                {
-                    var netAccessDoor = accessDoor.gameObject.GetOrAddComponent<NetworkAccessDoor>();
-                    netAccessDoor.Door = accessDoor;
-                    netAccessDoor.Region = netRegion;
-
-                    Globals.AccessDoors.Add(accessDoor.id, netAccessDoor);
-                }
-
-                foreach (var gordo in region.gameObject.GetComponentsInChildren<GordoEat>(true))
-                {
-                    var netGordo = gordo.gameObject.GetOrAddComponent<NetworkGordo>();
-                    netGordo.Gordo = gordo;
-                    netGordo.Region = netRegion;
-
-                    Globals.Gordos.Add(netGordo.ID, netGordo);
-                }
-
-                foreach (var puzzleSlot in region.gameObject.GetComponentsInChildren<PuzzleSlot>(true))
-                {
-                    var netPuzzleSlot = puzzleSlot.gameObject.GetOrAddComponent<NetworkPuzzleSlot>();
-                    netPuzzleSlot.Slot = puzzleSlot;
-                    netPuzzleSlot.Region = netRegion;
-
-                    Globals.PuzzleSlots.Add(puzzleSlot.id, netPuzzleSlot);
-                }
-
-                foreach (var masterSwitch in region.gameObject.GetComponentsInChildren<WorldStateMasterSwitch>(true))
-                {
-                    var netSwitch = masterSwitch.gameObject.GetOrAddComponent<NetworkWorldStateMasterSwitch>();
-                    netSwitch.Switch = masterSwitch;
-                    netSwitch.Region = netRegion;
-
-                    Globals.Switches.Add(masterSwitch.id, netSwitch);
-                }
-
-                foreach (var gadgetSite in region.gameObject.GetComponentsInChildren<GadgetSite>(true))
-                {
-                    var netGadgetSite = gadgetSite.gameObject.GetOrAddComponent<NetworkGadgetSite>();
-                    netGadgetSite.Site = gadgetSite;
-                    netGadgetSite.Region = netRegion;
-
-                    Globals.GadgetSites.Add(gadgetSite.id, netGadgetSite);
-                }
-
-                foreach (var treaturePod in region.gameObject.GetComponentsInChildren<TreasurePod>(true))
-                {
-                    var netTreasurePod = treaturePod.gameObject.GetOrAddComponent<NetworkTreasurePod>();
-                    netTreasurePod.Pod = treaturePod;
-                    netTreasurePod.Region = netRegion;
-
-                    Globals.TreasurePods.Add(treaturePod.id, netTreasurePod);
-                }
-
-                foreach (var spawner in region.gameObject.GetComponentsInChildren<DirectedActorSpawner>(true))
-                {
-                    var netSpawner = spawner.gameObject.GetOrAddComponent<NetworkDirectedActorSpawner>();
-                    netSpawner.ID = spawner.gameObject.GetGameObjectPath().GetHashCode();
-                    netSpawner.Spawner = spawner;
-                    netSpawner.Region = netRegion;
-
-                    Globals.Spawners.Add(netSpawner.ID, netSpawner);
-                }
-
-                foreach (var exchangeAcceptor in region.gameObject.GetComponentsInChildren<ExchangeAcceptor>(true))
-                {
-                    var netAcceptor = exchangeAcceptor.gameObject.GetOrAddComponent<NetworkExchangeAcceptor>();
-                    netAcceptor.ID = exchangeAcceptor.gameObject.GetGameObjectPath().GetHashCode();
-                    netAcceptor.Acceptor = exchangeAcceptor;
-                    netAcceptor.Region = netRegion;
-
-                    Globals.ExchangeAcceptors.Add(netAcceptor.ID, netAcceptor);
-                }
-
-                foreach (var fireColumn in region.gameObject.GetComponentsInChildren<FireColumn>(true))
-                {
-                    var netColumn = fireColumn.gameObject.GetOrAddComponent<NetworkFireColumn>();
-                    netColumn.ID = fireColumn.gameObject.GetGameObjectPath().GetHashCode();
-                    netColumn.Column = fireColumn;
-                    netColumn.Region = netRegion;
-
-                    Globals.FireColumns.Add(netColumn.ID, netColumn);
-                }
-
-                foreach (var kookadobaPatchNode in region.gameObject.GetComponentsInChildren<KookadobaPatchNode>(true))
-                {
-                    var netNode = kookadobaPatchNode.gameObject.GetOrAddComponent<NetworkKookadobaPatchNode>();
-                    netNode.ID = kookadobaPatchNode.gameObject.GetGameObjectPath().GetHashCode();
-                    netNode.Node = kookadobaPatchNode;
-                    netNode.Region = netRegion;
-
-                    Globals.Kookadobas.Add(netNode.ID, netNode);
-                }
-
-                foreach (var nutcracker in region.gameObject.GetComponentsInChildren<Nutcracker>(true))
-                {
-                    var netCracker = nutcracker.gameObject.GetOrAddComponent<NetworkNutcracker>();
-                    netCracker.ID = nutcracker.gameObject.GetGameObjectPath().GetHashCode();
-                    netCracker.Cracker = nutcracker;
-
-                    Globals.Nutcrackers.Add(netCracker.ID, netCracker);
-                }
-
-                foreach (var trigger in region.gameObject.GetComponentsInChildren<QuicksilverAmmoReplacer>(true))
-                {
-                    var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
-                    netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
-                    netTrigger.Ammo = trigger;
-
-                    Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
-                }
-
-                foreach (var trigger in region.gameObject.GetComponentsInChildren<QuicksilverEnergyCheckpoint>(true))
-                {
-                    var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
-                    netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
-                    netTrigger.Checkpoint = trigger;
-
-                    Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
-                }
-
-                foreach (var trigger in region.gameObject.GetComponentsInChildren<QuicksilverEnergyReplacer>(true))
-                {
-                    var netTrigger = trigger.gameObject.GetOrAddComponent<NetworkRaceTrigger>();
-                    netTrigger.ID = trigger.gameObject.GetGameObjectPath().GetHashCode();
-                    netTrigger.Energy = trigger;
-
-                    Globals.RaceTriggers.Add(netTrigger.ID, netTrigger);
-                }
-
-                foreach (var spawnResource in region.gameObject.GetComponentsInChildren<SpawnResource>(true))
-                {
-                    var netSpawnResource = spawnResource.gameObject.GetOrAddComponent<NetworkSpawnResource>();
-                    netSpawnResource.ID = spawnResource.gameObject.GetGameObjectPath().GetHashCode();
-                    netSpawnResource.SpawnResource = spawnResource;
-                    netSpawnResource.Region = netRegion;
-                    netSpawnResource.LandPlot = spawnResource.GetComponentInParent<NetworkLandplot>(true);
-
-                    if (!Globals.SpawnResources.ContainsKey(netSpawnResource.ID))
-                    {
-                        Globals.SpawnResources.Add(netSpawnResource.ID, netSpawnResource);
-                    }
-                }
-            }
 
             if (Globals.IsClient)
             {