fix nullref pt.2

RowpannSCP · Jun 19, 2022 · f12201c · f12201c
1 parent 3843a6a
commit f12201c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/hats/EventHandler.cs b/hats/EventHandler.cs
@@ -12,6 +12,8 @@ public class EventHandler
 
         public void WaitingForPlayers()
         {
+            if (API.Hats.Count != 0)
+                return;
             API.LoadHats();
         }
 
@@ -20,5 +22,10 @@ public void OnLeave(LeftEventArgs ev)
             if(ev.Player.GameObject.TryGetComponent<HatComponent>(out _))
                 ev.Player.RemoveHat();
         }
+
+        public void EndingRound(EndingRoundEventArgs ev)
+        {
+            API.LoadHats();
+        }
     }
 }
diff --git a/hats/Plugin.cs b/hats/Plugin.cs
@@ -26,6 +26,7 @@ public override void OnEnabled()
             Handler = new EventHandler(Config);
 
             Server.WaitingForPlayers += Handler.WaitingForPlayers;
+            Server.EndingRound += Handler.EndingRound;
             Player.Left += Handler.OnLeave;
 
             base.OnEnabled();
@@ -34,6 +35,7 @@ public override void OnEnabled()
         public override void OnDisabled()
         {
             Server.WaitingForPlayers -= Handler.WaitingForPlayers;
+            Server.EndingRound -= Handler.EndingRound;
             Player.Left -= Handler.OnLeave;
 
             Singleton = null;