update for v215

destoer · Apr 26, 2024 · bfc4e38 · bfc4e38
1 parent 0e7ecf5
commit bfc4e38
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 56 deletions.
diff --git a/Cs2Jailbreak.csproj b/Cs2Jailbreak.csproj
diff --git a/Cs2Jailbreak.sln b/Cs2Jailbreak.sln
@@ -1,22 +1,28 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cs2Jailbreak", "src\Cs2Jailbreak.csproj", "{725B192E-0E77-435E-AA7A-E5F6FD1E3082}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{725B192E-0E77-435E-AA7A-E5F6FD1E3082}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{725B192E-0E77-435E-AA7A-E5F6FD1E3082}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{725B192E-0E77-435E-AA7A-E5F6FD1E3082}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{725B192E-0E77-435E-AA7A-E5F6FD1E3082}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WardenService", "WardenService\WardenService.csproj", "{4D7143BE-B93A-494A-AB27-CC984332BDC0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cs2Jailbreak", "src\Cs2Jailbreak.csproj", "{16C3C0CB-D2C7-49E0-911C-E311FB59EF6A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4D7143BE-B93A-494A-AB27-CC984332BDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D7143BE-B93A-494A-AB27-CC984332BDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D7143BE-B93A-494A-AB27-CC984332BDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D7143BE-B93A-494A-AB27-CC984332BDC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16C3C0CB-D2C7-49E0-911C-E311FB59EF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16C3C0CB-D2C7-49E0-911C-E311FB59EF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16C3C0CB-D2C7-49E0-911C-E311FB59EF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16C3C0CB-D2C7-49E0-911C-E311FB59EF6A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/WardenService/WardenService.csproj b/WardenService/WardenService.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.193" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.215" />
   </ItemGroup>
 
 </Project>
diff --git a/install.bat b/install.bat
@@ -0,0 +1,2 @@
+cp src/bin/Debug/net8.0/* "../../plugins/Cs2Jailbreak/"
+cp -r lang "../../plugins/Cs2Jailbreak/"
diff --git a/src/Cs2Jailbreak.csproj b/src/Cs2Jailbreak.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.193" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.215" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.1" />
     <PackageReference Include="MySqlConnector" Version="2.3.1" />
 

diff --git a/src/Debug.cs b/src/Debug.cs
@@ -62,13 +62,7 @@ public static void TestNoblockCmd(CCSPlayerController? invoke, CommandInfo comma
                 continue;
             }
 
-            var col = pawn.Collision;
-
-            if(col != null)
-            {
-                pawn.MyCollisionGroup = (byte)CollisionGroup.COLLISION_GROUP_DEBRIS_TRIGGER;
-                col.CollisionGroup = (byte)CollisionGroup.COLLISION_GROUP_DEBRIS_TRIGGER;
-            }
+            // TODO
         }      
     }
 

diff --git a/src/Jail.cs b/src/Jail.cs
@@ -163,7 +163,7 @@ public void SetWarden(CCSPlayerController player)
 
 // main plugin file, controls central hooking
 // defers to warden, lr and sd
-[MinimumApiVersion(213)]
+[MinimumApiVersion(215)]
 public class JailPlugin : BasePlugin, IPluginConfig<JailConfig>
 {
     // Global event settings, used to filter plugin activits
@@ -211,7 +211,7 @@ public static void PurgePlayerStats(CCSPlayerController? player)
 
     public override string ModuleName => "CS2 Jailbreak - destoer";
 
-    public override string ModuleVersion => "v0.4.1";
+    public override string ModuleVersion => "v0.4.3";
 
     public override void Load(bool hotReload)
     {

diff --git a/src/Lib/Player.cs b/src/Lib/Player.cs
@@ -232,14 +232,7 @@ static public void PlaySound(this CCSPlayerController? player, String sound)
     // OnPostThink doesn't appear to be good enough?
     static public void HideWeapon(this CCSPlayerController? player)
     {
-        CCSPlayerPawn? pawn = player.Pawn();
-
-        if(pawn != null)
-        {
-            pawn.PrimaryAddon = 0;
-            pawn.SecondaryAddon = 0;
-            pawn.AddonBits = 0;
-        }
+        Server.PrintToChatAll("Hide weapon uimpl");
     }
 
     static public void ListenAll(this CCSPlayerController? player)