Fix Instance Dungeons

Previously /leave would leave the player stuck which would make admin intervention necessary
Dawn-of-Light · Aug 18, 2024 · beb1d26 · beb1d26
1 parent 5df6c2f
commit beb1d26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/GameServer/gameobjects/GameObject.cs b/GameServer/gameobjects/GameObject.cs
@@ -115,7 +115,7 @@ public virtual Region CurrentRegion
 			set
             {
                 if(value == null) Position = Position.With(regionID: 0);
-                Position = Position.With(regionID: value.ID);
+                else Position = Position.With(regionID: value.ID);
             }
 		}
 

diff --git a/GameServer/gameobjects/GamePlayer.cs b/GameServer/gameobjects/GamePlayer.cs
@@ -9927,7 +9927,11 @@ public override bool MoveTo(Position position)
 				if (!RemoveFromWorld())
 					return false;
 				//notify event
-				CurrentRegion.Notify(RegionEvent.PlayerLeave, CurrentRegion, new RegionPlayerEventArgs(this));
+
+                if(CurrentRegion != null)
+                {
+                    CurrentRegion.Notify(RegionEvent.PlayerLeave, CurrentRegion, new RegionPlayerEventArgs(this));
+                }
 
 				CancelAllConcentrationEffects(true);
 				if (ControlledBrain != null)
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,7 +115,7 @@ public virtual Region CurrentRegion @@
     			set
                 {
                     if(value == null) Position = Position.With(regionID: 0);
-                    Position = Position.With(regionID: value.ID);
+                    else Position = Position.With(regionID: value.ID);
                 }
     		}
@@ Expand Down @@