Reapply HighPrecisionPhysics

SubnauticaNitrox · Nov 19, 2023 · d83877d · d83877d
1 parent 3a8d18a
commit d83877d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 76 deletions.
diff --git a/NitroxClient/GameLogic/Spawning/WorldEntitySpawner.cs b/NitroxClient/GameLogic/Spawning/WorldEntitySpawner.cs
@@ -22,54 +22,9 @@ public WorldEntitySpawner(PlayerManager playerManager, ILocalNitroxPlayer localP
     {
         worldEntitySpawnResolver = new WorldEntitySpawnerResolver(playerManager, localPlayer, simulationOwnership, entities);
 
-            if (NitroxEnvironment.IsNormal)
-            {
-                batchCellsById = (Dictionary<Int3, BatchCells>)LargeWorldStreamer.main.cellManager.batch2cells;
-            }
-        }
-
-        public override IEnumerator SpawnAsync(WorldEntity entity, TaskResult<Optional<GameObject>> result)
+        if (NitroxEnvironment.IsNormal)
         {
-            LargeWorldStreamer.main.cellManager.UnloadBatchCells(entity.AbsoluteEntityCell.CellId.ToUnity()); // Just in case
-
-            EntityCell cellRoot = EnsureCell(entity);
-
-            Optional<GameObject> parent = (entity.ParentId != null) ? NitroxEntity.GetObjectFrom(entity.ParentId) : Optional.Empty;
-
-            IWorldEntitySpawner entitySpawner = worldEntitySpawnResolver.ResolveEntitySpawner(entity);
-
-            return entitySpawner.SpawnAsync(entity, parent, cellRoot, result);
-        }
-        public override bool SpawnsOwnChildren(WorldEntity entity)
-        {
-            IWorldEntitySpawner entitySpawner = worldEntitySpawnResolver.ResolveEntitySpawner(entity);
-            return entitySpawner.SpawnsOwnChildren();
-        }
-
-        private EntityCell EnsureCell(WorldEntity entity)
-        {
-            EntityCell entityCell;
-
-            Int3 batchId = entity.AbsoluteEntityCell.BatchId.ToUnity();
-            Int3 cellId = entity.AbsoluteEntityCell.CellId.ToUnity();
-
-            if (!batchCellsById.TryGetValue(batchId, out BatchCells batchCells))
-            {
-                batchCells = LargeWorldStreamer.main.cellManager.InitializeBatchCells(batchId);
-            }
-
-            entityCell = batchCells.Get(cellId, entity.AbsoluteEntityCell.Level);
-
-            if (entityCell == null)
-            {
-                entityCell = batchCells.Add(cellId, entity.AbsoluteEntityCell.Level);
-                entityCell.Initialize();
-            }
-
-            entityCell.EnsureRoot();
-
-            return entityCell;
->>>>>>> ddf37665 (first round of bug fixes)
+            batchCellsById = (Dictionary<Int3, BatchCells>)LargeWorldStreamer.main.cellManager.batch2cells;
         }
     }
 

diff --git a/NitroxPatcher/Patches/Dynamic/GroundMotor_UpdateFunction_Patch.cs b/NitroxPatcher/Patches/Dynamic/GroundMotor_UpdateFunction_Patch.cs
diff --git a/NitroxPatcher/Patches/Dynamic/Player_RequiresHighPrecisionPhysics_Patch.cs b/NitroxPatcher/Patches/Dynamic/Player_RequiresHighPrecisionPhysics_Patch.cs
@@ -22,7 +22,7 @@ public static bool Prefix(ref bool __result)
 
             if (movementController && movementController.Receiving)
             {
-                __result = false;
+                __result = true;
                 return false;
             }
         }