Merge branch 'main' of https://git.zenny.quest/zenayi/GameJamDungeon

2025-10-08 00:59:25 -07:00
parent 9ed5f8600c e29bef51c5
commit b0f6aa176e
2 changed files with 3 additions and 1 deletions
--- a/Zennysoft.Game.Ma/src/map/Map.cs
+++ b/Zennysoft.Game.Ma/src/map/Map.cs
@@ -105,6 +105,7 @@ public partial class Map : Node3D, IMap
  private void ClearCurrentMap()
  {
    CurrentFloor?.CallDeferred(MethodName.QueueFree, []);
+    Player.TeleportPlayer(new Transform3D(Basis.Identity, new Vector3(-999, -999, -999)));
  }

  private void SetupDungeonFloor()
--- a/Zennysoft.Game.Ma/src/map/dungeon/code/CorridorRoom.cs
+++ b/Zennysoft.Game.Ma/src/map/dungeon/code/CorridorRoom.cs
@@ -19,7 +19,8 @@ public partial class CorridorRoom : Node3D

  public void Setup()
  {
-    _room.BodyEntered += Room_BodyEntered;
+    if (_room != null)
+      _room.BodyEntered += Room_BodyEntered;
  }

  private void Room_BodyEntered(Node3D body)