things

RowpannSCP · Aug 29, 2022 · 28de4ce · 28de4ce
1 parent 628361e
commit 28de4ce
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/hats/API.cs b/hats/API.cs
@@ -12,6 +12,8 @@
 
 namespace hats
 {
+    using System.Diagnostics;
+
     public static class API
     {
         public static Dictionary<string, Hat> Hats { get; private set; } = new Dictionary<string, Hat>();
@@ -50,7 +52,16 @@ public static void ClearHats()
             }
             foreach (var kvp in Hats)
             {
-                kvp.Value.DestroyInstances();
+                try
+                {
+                    kvp.Value.DestroyInstances();
+                }
+                catch (ArgumentException e)
+                {
+                    Console.WriteLine(e);
+                    throw;
+                }
+
             }
             Hats.Clear();
         }

diff --git a/hats/Commands/HatDebug.cs b/hats/Commands/HatDebug.cs
@@ -43,7 +43,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
             return false;
         }
 
-        public string Command { get; } = "Debug";
+        public string Command { get; } = "debug";
         public string[] Aliases { get; } = { };
         public string Description { get; } = "Print hat debug information";
     }

diff --git a/hats/Config.cs b/hats/Config.cs
@@ -7,7 +7,8 @@ namespace hats
     public class Config : IConfig
     {
         public bool IsEnabled { get; set; } = true;
-
+        public bool RemoveHatOnDeath { get; set; } = true;
+
         public string CommandPrefix { get; set; } = "hatplugin";
 
         public List<HatConfig> Hats { get; set; }= new List<HatConfig>()

diff --git a/hats/EventHandler.cs b/hats/EventHandler.cs
@@ -19,6 +19,14 @@ public void WaitingForPlayers()
             _isLoaded = true;
         }
 
+        public void Died(DiedEventArgs ev)
+        {
+            if(!cfg.RemoveHatOnDeath)
+                return;
+            if(ev.Target.GameObject.TryGetComponent<HatComponent>(out _))
+                ev.Target.RemoveHat();
+        }
+
         public void OnLeave(LeftEventArgs ev)
         {
             if(ev.Player.GameObject.TryGetComponent<HatComponent>(out _))

diff --git a/hats/Hat.cs b/hats/Hat.cs
@@ -31,7 +31,7 @@ public void DestroyInstances()
             List<KeyValuePair<string, HatComponent>> toRemove = new List<KeyValuePair<string, HatComponent>>();
             foreach (var kvp in Plugin.Singleton.hats.Where(x => x.Value.hat == this))
             {
-                if (kvp.Value is null || kvp.Value.gameObject == null || !kvp.Value.schem.isActiveAndEnabled)
+                if (kvp.Value is null  || kvp.Value.schem.gameObject == null || !kvp.Value.schem.isActiveAndEnabled)
                 {
                     toRemove.Add(kvp);
                     continue;

diff --git a/hats/Plugin.cs b/hats/Plugin.cs
@@ -11,7 +11,7 @@ public class Plugin : Plugin<Config>
     {
         public override string Author { get; } = "Rowpann SCP";
         public override string Name { get; } = "hats";
-        public override Version Version { get; } = new Version(1, 2, 0);
+        public override Version Version { get; } = new Version(1, 3, 0);
         public override Version RequiredExiledVersion { get; } = new Version(5, 2, 0);
 
         public static Plugin Singleton;
@@ -26,6 +26,7 @@ public override void OnEnabled()
 
             Server.WaitingForPlayers += Handler.WaitingForPlayers;
             Player.Left += Handler.OnLeave;
+            Player.Died += Handler.Died;
 
             base.OnEnabled();
         }
@@ -34,6 +35,7 @@ public override void OnDisabled()
         {
             Server.WaitingForPlayers -= Handler.WaitingForPlayers;
             Player.Left -= Handler.OnLeave;
+            Player.Died -= Handler.Died;
 
             Singleton = null;
             Handler = null;