From 639682fd50d4fcbcbb5905e3ec2fdcdbfa8f6a67 Mon Sep 17 00:00:00 2001
From: 3cxc <81449257+3cxc@users.noreply.github.com>
Date: Fri, 13 Feb 2026 00:58:14 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EasyTools.csproj             |  2 +-
 Events/CustomEventHandler.cs | 99 +++++++++++++++++++-----------------
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/EasyTools.csproj b/EasyTools.csproj
index 9b0db99..98d5a3b 100644
--- a/EasyTools.csproj
+++ b/EasyTools.csproj
@@ -125,7 +125,7 @@
     <Compile Include="Commands\Chat\AcCommand.cs" />
     <Compile Include="Commands\Chat\BcCommand.cs" />
     <Compile Include="Commands\Chat\CCommand.cs" />
-    <Compile Include="Commands\RescueCommand.cs" />
+    <Compile Include="Commands\KillMeCommand.cs" />
     <Compile Include="Configs\BadgeConfig.cs" />
     <Compile Include="Configs\Config.cs" />
     <Compile Include="Configs\CustomRoleConfig.cs" />
diff --git a/Events/CustomEventHandler.cs b/Events/CustomEventHandler.cs
index 2a0865d..4a30457 100644
--- a/Events/CustomEventHandler.cs
+++ b/Events/CustomEventHandler.cs
@@ -120,54 +120,8 @@ namespace EasyTools.Events
                 Badge.Remove(player);
             }
 
-        }
-
-        public override void OnPlayerHurting(PlayerHurtingEventArgs ev)
-        {
-            if (Config.Harmless207)
             {
-                if (ev.DamageHandler is UniversalDamageHandler && ev.DamageHandler.DeathScreenText.Contains("SCP-207"))
-                {
-                    ev.IsAllowed = false;
-                }
-            }
-
-            if (Config.Harmless1853)
-            {
-                if (ev.DamageHandler is UniversalDamageHandler && ev.DamageHandler.DeathScreenText.Contains("poison"))
-                {
-                    ev.IsAllowed = false;
-                }
-            }
-        }
-
-        public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
-        {
-            if (Config.GuardsCanEscape)
-            {
-                RoleTypeId id;
-                switch (Config.EscapedGuardRole)
-                {
-                    case "NtfSergeant":
-                        id = RoleTypeId.NtfSergeant;
-                        break;
-                    case "NtfPrivate":
-                        id = RoleTypeId.NtfPrivate;
-                        break;
-                    case "NtfSpecialist":
-                        id = RoleTypeId.NtfSpecialist;
-                        break;
-                    default:
-                        id = RoleTypeId.NtfCaptain;
-                        break;
-
-                }
-
-                if (ev.Player.Role == RoleTypeId.FacilityGuard)
-                {
-                    ev.Player.SetRole(id);
-                    ev.IsAllowed = true;
-                }
+                _huds.Remove(player);
             }
         }
 
@@ -241,6 +195,55 @@ namespace EasyTools.Events
 
         }
 
+        public override void OnPlayerHurting(PlayerHurtingEventArgs ev)
+        {
+            if (Config.Harmless207)
+            {
+                if (ev.DamageHandler is UniversalDamageHandler && ev.DamageHandler.DeathScreenText.Contains("SCP-207"))
+                {
+                    ev.IsAllowed = false;
+                }
+            }
+
+            if (Config.Harmless1853)
+            {
+                if (ev.DamageHandler is UniversalDamageHandler && ev.DamageHandler.DeathScreenText.Contains("poison"))
+                {
+                    ev.IsAllowed = false;
+                }
+            }
+        }
+
+        public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
+        {
+            if (Config.GuardsCanEscape)
+            {
+                RoleTypeId id;
+                switch (Config.EscapedGuardRole)
+                {
+                    case "NtfSergeant":
+                        id = RoleTypeId.NtfSergeant;
+                        break;
+                    case "NtfPrivate":
+                        id = RoleTypeId.NtfPrivate;
+                        break;
+                    case "NtfSpecialist":
+                        id = RoleTypeId.NtfSpecialist;
+                        break;
+                    default:
+                        id = RoleTypeId.NtfCaptain;
+                        break;
+
+                }
+
+                if (ev.Player.Role == RoleTypeId.FacilityGuard)
+                {
+                    ev.Player.SetRole(id);
+                    ev.IsAllowed = true;
+                }
+            }
+        }
+
         public override void OnPlayerInteractingScp330(PlayerInteractingScp330EventArgs ev)
         {
             if (Config.EnablePinkCandy)
@@ -297,7 +300,7 @@ namespace EasyTools.Events
         public override void OnPlayerFlippingCoin(PlayerFlippingCoinEventArgs ev)
         {
             if (!ev.IsAllowed) return;
-            if (!Config.coin) return;
+            if (!Config.Coin) return;
             if (ev.Player.Items.Count() == 8)
             {
                 ev.Player.SendBroadcast($"\n<b><size=25><color=#00CC00>你的背包空间不足，无法继续抽卡！</color></size></b>", 2);