add vip flag, fix sd cancel

destoer · May 13, 2024 · a2647fb · a2647fb
1 parent b395096
commit a2647fb
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 11 deletions.
diff --git a/WardenService/WardenService.csproj b/WardenService/WardenService.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.215" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.233" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cs2Jailbreak.csproj b/src/Cs2Jailbreak.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.215" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.233" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.1" />
     <PackageReference Include="MySqlConnector" Version="2.3.1" />
 

diff --git a/src/Lib/Lib.cs b/src/Lib/Lib.cs
@@ -75,7 +75,7 @@ static public void MuteT()
     {
         foreach(CCSPlayerController player in Lib.GetPlayers())
         {
-            if(player.IsT())
+            if(player.IsT() && !player.IsVip())
             {
                 player.Mute();
             }

diff --git a/src/Lib/Player.cs b/src/Lib/Player.cs
@@ -207,6 +207,17 @@ static public void SetColour(this CCSPlayerController? player, Color colour)
         }
     }
 
+    static public bool IsVip(this CCSPlayerController? player)
+    {
+        if(!player.IsLegal())
+        {
+            return false;
+        }
+
+        return AdminManager.PlayerHasPermissions(player,new String[] {"@css/vip"});
+    }
+
+
     static public bool IsGenericAdmin(this CCSPlayerController? player)
     {
         if(!player.IsLegal())

diff --git a/src/Lib/Timer.cs b/src/Lib/Timer.cs
@@ -108,10 +108,10 @@ static public void RespawnDelay(this CCSPlayerController? player, float delay)
     }
 
     // ent
-    static public void RemoveDelay(this CEntityInstance entity, float delay, String name)
+    static public void RemoveDelay(this CEntityInstance? entity, float delay, String name)
     {
         // remove projectile
-        if(entity.DesignerName == name)
+        if(entity != null && entity.DesignerName == name)
         {
             int index = (int)entity.Index;
 

diff --git a/src/SpecialDay/SDBase.cs b/src/SpecialDay/SDBase.cs
@@ -154,6 +154,7 @@ public void CleanupPlayers()
     {
         foreach(CCSPlayerController player in Lib.GetAlivePlayers())
         {
+            player.StripWeapons();
             CleanupPlayer(player);
         }       
     }
@@ -170,8 +171,10 @@ public void ResurectPlayer(CCSPlayerController player,float delay)
         JailPlugin.globalCtx.AddTimer(delay, () =>
         {
             CCSPlayerController? target = Utilities.GetPlayerFromSlot(victimSlot);
-            target.Respawn();
-
+            if(target.IsLegal())
+            {
+                target.Respawn();
+            }
         },CSTimer.TimerFlags.STOP_ON_MAPCHANGE);
 
         JailPlugin.globalCtx.AddTimer(delay + 0.5f,() =>

diff --git a/src/Warden/WardenCmd.cs b/src/Warden/WardenCmd.cs
@@ -287,10 +287,13 @@ public void ColourCallback(CCSPlayerController? invoke, ChatMenuOption option)
 
         CCSPlayerController? player = Utilities.GetPlayerFromSlot(colourSlot);
 
-        Color colour = Lib.COLOUR_CONFIG_MAP[option.Text];
+        if(player.IsLegalAlive())
+        {
+            Color colour = Lib.COLOUR_CONFIG_MAP[option.Text];
 
-        Chat.Announce(WARDEN_PREFIX,$"Setting {player.PlayerName} colour to {option.Text}");
-        player.SetColour(colour);
+            Chat.Announce(WARDEN_PREFIX,$"Setting {player.PlayerName} colour to {option.Text}");
+            player.SetColour(colour);
+        }
     }
 
     public void ColourPlayerCallback(CCSPlayerController? invoke, ChatMenuOption option)
@@ -448,7 +451,10 @@ public void TakeWardenCmd(CCSPlayerController? player, CommandInfo command)
         {
             var warden = Utilities.GetPlayerFromSlot(wardenSlot);
 
-            player.LocalizePrefix(WARDEN_PREFIX,"warden.warden_taken",warden.PlayerName);
+            if(warden.IsLegal())
+            {
+                player.LocalizePrefix(WARDEN_PREFIX,"warden.warden_taken",warden.PlayerName);
+            }
         }
 
         // player is valid to take warden