bumped version to 1.3.1 and fixed bug where the chat message would sh…

…ow if someone tried to defuse and there was an active grenade
B3none · Jan 9, 2024 · 961bd8c · 961bd8c
1 parent 8298edf
commit 961bd8c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/CounterStrikeSharp/.gitignore b/CounterStrikeSharp/.gitignore
diff --git a/CounterStrikeSharp/README.md b/CounterStrikeSharp/README.md
diff --git a/InstadefusePlugin.cs b/InstadefusePlugin.cs
@@ -10,7 +10,7 @@ namespace InstadefusePlugin;
 [MinimumApiVersion(129)]
 public class InstadefusePlugin : BasePlugin
 {
-    private const string Version = "1.3.0";
+    private const string Version = "1.3.1";
 
     public override string ModuleName => "Instadefuse Plugin";
     public override string ModuleVersion => Version;
@@ -201,15 +201,6 @@ private void AttemptInstadefuse(CCSPlayerController player)
             return;
         }
 
-        PrintThreatLevel();
-
-        if (_heThreat > 0 || _molotovThreat > 0 || _infernoThreat.Any())
-        {
-            Console.WriteLine($"{LogPrefix}Instant Defuse not possible because a grenade threat is active!");
-            Server.PrintToChatAll($"{MessagePrefix}Instant Defuse not possible because a grenade threat is active!");
-            return;
-        }
-
         var plantedBomb = FindPlantedBomb();
         if (plantedBomb == null)
         {
@@ -228,6 +219,15 @@ private void AttemptInstadefuse(CCSPlayerController player)
             Console.WriteLine($"{LogPrefix}Terrorists are still alive");
             return;
         }
+
+        PrintThreatLevel();
+
+        if (_heThreat > 0 || _molotovThreat > 0 || _infernoThreat.Any())
+        {
+            Console.WriteLine($"{LogPrefix}Instant Defuse not possible because a grenade threat is active!");
+            Server.PrintToChatAll($"{MessagePrefix}Instant Defuse not possible because a grenade threat is active!");
+            return;
+        }
 
         var bombTimeUntilDetonation = plantedBomb.TimerLength - (Server.CurrentTime - _bombPlantedTime);
 

diff --git a/InstadefusePlugin.csproj b/InstadefusePlugin.csproj
@@ -6,12 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <Reference Include="CounterStrikeSharp.API">
-         <HintPath>.\CounterStrikeSharp\addons\counterstrikesharp\api\CounterStrikeSharp.API.dll</HintPath>
-      </Reference>
-  </ItemGroup>
-
-  <ItemGroup>
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.142" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
   </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(CopyPath)' != '' ">
+    <Exec Command="copy &quot;$(TargetPath)&quot; &quot;$(CopyPath)&quot; " />
+  </Target>
 </Project>