Fix godmode flag

ImperialPlugins · Jul 10, 2016 · 648e843 · 648e843
1 parent 3c53dc9
commit 648e843
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/Model/Flag/Flag.cs b/Model/Flag/Flag.cs
@@ -13,7 +13,7 @@ namespace Safezone.Model.Flag
     public abstract class Flag
     {
         public SafeZone SafeZone { get; internal set; }
-        private static readonly Dictionary<string, Type> RegisteredFlags = new Dictionary<string, Type>();
+        internal static readonly Dictionary<string, Type> RegisteredFlags = new Dictionary<string, Type>();
         public string Name;
         private object _value;
 

diff --git a/Model/Flag/Impl/GodmodeFlag.cs b/Model/Flag/Impl/GodmodeFlag.cs
@@ -23,7 +23,14 @@ public override void UpdateState(List<UnturnedPlayer> players)
 
         public override void OnSafeZoneEnter(UnturnedPlayer player)
         {
-            _lastHealth.Add(player.CSteamID.m_SteamID, player.Health);
+            if (!_lastHealth.ContainsKey(player.CSteamID.m_SteamID))
+            {
+                _lastHealth.Add(player.CSteamID.m_SteamID, player.Health);
+            }
+            else
+            {
+                _lastHealth[player.CSteamID.m_SteamID] = player.Health;
+            }
             if (!GetValue<bool>(SafeZone.GetGroup(player))) return;
             EnableGodMode(player);
         }
@@ -33,6 +40,7 @@ public override void OnSafeZoneLeave(UnturnedPlayer player)
             if (!GetValue<bool>(SafeZone.GetGroup(player))) return;
             DisableGodMode(player);
 
+            if (!_lastHealth.ContainsKey(player.CSteamID.m_SteamID)) return;
             var health = _lastHealth[player.CSteamID.m_SteamID];
             var currentHealth = player.Health;
             if (currentHealth < health)
@@ -43,6 +51,7 @@ public override void OnSafeZoneLeave(UnturnedPlayer player)
             {
                 player.Damage((byte)(currentHealth - health), Vector3.zero, EDeathCause.KILL, ELimb.SPINE, CSteamID.Nil);
             }
+            _lastHealth.Remove(player.CSteamID.m_SteamID);
         }
 
         private void EnableGodMode(IRocketPlayer player)
@@ -55,6 +64,7 @@ private void EnableGodMode(IRocketPlayer player)
             var unturnedPlayer = (UnturnedPlayer)player;
             //Safe current godmode state and restore it later when the player leaves the safezone
             //this is for e.g. players who enter with /god safezones
+            if (_godModeStates.ContainsKey(id)) _godModeStates.Remove(id);
             _godModeStates.Add(id, unturnedPlayer.Features.GodMode);
             unturnedPlayer.Features.GodMode = true;
         }
@@ -71,15 +81,18 @@ private void DisableGodMode(IRocketPlayer player)
             try
             {
                 //Try to restore previous godmode state
-                unturnedPlayer.Features.GodMode = _godModeStates[id];
+                var val = _godModeStates.ContainsKey(id) && _godModeStates[id];
+                unturnedPlayer.Features.GodMode = val;
             }
             catch (Exception ex)
             {
                 //Something went wrong??
                 Logger.LogException(ex);
                 unturnedPlayer.Features.GodMode = false;
             }
-            _godModeStates.Remove(id);
+
+            if(_godModeStates.ContainsKey(id))
+                _godModeStates.Remove(id);
         }
     }
 }
diff --git a/SafeZonePlugin.cs b/SafeZonePlugin.cs
@@ -82,6 +82,7 @@ protected override void Unload()
             StopListening();
             Instance = null;
             SafeZoneType.RegistereTypes?.Clear();
+            Flag.RegisteredFlags.Clear();
         }