cleaner world death

daud-io · Mar 12, 2019 · 3afcdce · 3afcdce
1 parent 7633890
commit 3afcdce
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/Game.Engine/Core/Player.cs b/Game.Engine/Core/Player.cs
@@ -143,8 +143,15 @@ public void Destroy()
                 Fleet = null;
             }
 
-            World.Actors.Remove(this);
+            if (this.Connection != null)
+                try
+                {
+                    ((IDisposable)this.Connection).Dispose();
+                } catch (Exception) { }
+            this.Connection = null;
 
+            World.Actors.Remove(this);
+
             var worldPlayers = GetWorldPlayers(World);
             worldPlayers.Remove(this);
         }

diff --git a/Game.Engine/Core/SystemActors/Advertisement.cs b/Game.Engine/Core/SystemActors/Advertisement.cs
@@ -1,6 +1,5 @@
 namespace Game.Engine.Core.SystemActors
 {
-    using System;
     using System.Linq;
 
     public class Advertisement : SystemActorBase
@@ -16,11 +15,17 @@ protected override void CycleThink()
 
             if (World.AdvertisedPlayerCount > 0)
                 EmptySince = World.Time;
+        }
 
-
-            if (World.Hook.AutoRemoveOnEmptyThreshold > 0 && EmptySince > 0 && (World.Time - EmptySince) > World.Hook.AutoRemoveOnEmptyThreshold)
-            {
+        protected override void CycleCreateDestroy()
+        {
+            base.CycleCreateDestroy();
+            if (World.Hook.AutoRemoveOnEmptyThreshold > 0
+                && EmptySince > 0
+                && (World.Time - EmptySince) > World.Hook.AutoRemoveOnEmptyThreshold
+            ) {
                 Worlds.Destroy(World.WorldKey);
+                EmptySince = 0;
             }
         }
     }

diff --git a/Game.Engine/Core/SystemActors/SystemActorBase.cs b/Game.Engine/Core/SystemActors/SystemActorBase.cs
@@ -7,9 +7,13 @@ public abstract class SystemActorBase : IActor
         public World World = null;
         protected long SleepUntil = 0;
         protected int CycleMS = 1000;
+        private bool RunningThisStep = false;
+
 
         public virtual void CreateDestroy()
         {
+            if (RunningThisStep)
+                CycleCreateDestroy();
         }
 
         public virtual void Destroy()
@@ -30,11 +34,14 @@ public virtual void Think()
         {
             if (World != null && World.Time > SleepUntil)
             {
+                RunningThisStep = true;
                 CycleThink();
 
                 if (World != null)
                     SleepUntil = World.Time + CycleMS;
             }
+            else
+                RunningThisStep = false;
         }
     }
 }
diff --git a/Game.Engine/Networking/Connection.cs b/Game.Engine/Networking/Connection.cs
@@ -647,6 +647,7 @@ private async Task HandleIncomingMessage(NetQuantum quantum)
                 if (player != null)
                 {
                     player.PendingDestruction = true;
+                    player.Connection = null;
                 }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                     if (player != null)
                     {
                         player.PendingDestruction = true;
+                        player.Connection = null;
                     }
                 }
             }
@@ Expand Down @@