diff --git a/Events/CustomEventHandler.cs b/Events/CustomEventHandler.cs
index 3b28043..3cf4e13 100644
--- a/Events/CustomEventHandler.cs
+++ b/Events/CustomEventHandler.cs
@@ -28,6 +28,19 @@ namespace EasyTools.Events
 
         public static TranslateConfig TranslateConfig;
 
+        public static BadgeConfig BadgeConfig;
+        public static CoroutineHandle Badge_Coroutine;
+        public override void OnServerWaitingForPlayers()
+        {
+            base.OnServerWaitingForPlayers();
+
+            if (BadgeConfig.Enable)
+            {
+                Badge.rainbw.Clear();
+                Badge_Coroutine = Timing.RunCoroutine(Badge.Rainbw());
+            }
+        }
+
         public override void OnServerRoundStarted()
         {
             Timing.CallDelayed(10f, () =>
@@ -39,6 +52,16 @@ namespace EasyTools.Events
             });
         }
 
+        public override void OnServerRoundEnded(RoundEndedEventArgs ev)
+        {
+            base.OnServerRoundEnded(ev);
+
+            if (BadgeConfig.Enable)
+            {
+                Timing.KillCoroutines(Badge_Coroutine);
+            }
+        }
+
         public override void OnPlayerJoined(PlayerJoinedEventArgs ev)
         {
             base.OnPlayerJoined(ev);
@@ -57,6 +80,17 @@ namespace EasyTools.Events
 
                 File.AppendAllText(Config.LoggerSavePath, playerInfo + Environment.NewLine);
             }
+            if (BadgeConfig.Enable)
+            {
+                Badge.Handler(player);
+            }
+
+        }
+            if (BadgeConfig.Enable)
+            {
+                Badge.Remove(player);
+            }
+            
         }
 
         public override void OnPlayerHurting(PlayerHurtingEventArgs ev)