fix: FixVectorLeak submodule

fix: ProcessMovement hook removed

Author: oscar-wos

.github/workflows/build.yml

@@ -26,12 +26,10 @@ jobs:
             - name: Create Directories
               run: |
                 mkdir -p plugin/plugins/${{ github.event.repository.name }}
-                mkdir -p plugin/gamedata
 
             - name: Move Files
               run: |
                 mv ./src/bin/Release/net8.0/* ./plugin/plugins/${{ github.event.repository.name }}
-                mv ./gamedata/* ./plugin/gamedata
 
             - name: Zip
               run: |

.github/workflows/release.yml

@@ -51,12 +51,10 @@ jobs:
             - name: Create Directories
               run: |
                 mkdir -p plugin/plugins/${{ github.event.repository.name }}
-                mkdir -p plugin/gamedata
 
             - name: Move Files
               run: |
                 mv ./src/bin/Release/net8.0/* ./plugin/plugins/${{ github.event.repository.name }}
-                mv ./gamedata/* ./plugin/gamedata
 
             - name: Zip
               run: |

AntiRush.sln

@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Menu", "Menu\src\Menu.cspro
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSSharpUtils", "CSSharpUtils\CSSharpUtils\CSSharpUtils.csproj", "{794D24A4-83A3-4F67-94DE-09087FC9554E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FixVectorLeak", "FixVectorLeak\FixVectorLeak.csproj", "{819E87B2-A320-E7BB-96D6-D3592826755C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FixVectorLeak", "FixVectorLeak\src\FixVectorLeak.csproj", "{6A138DCE-DAAF-6D45-750E-24C967185836}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,10 +29,10 @@ Global
 		{794D24A4-83A3-4F67-94DE-09087FC9554E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{794D24A4-83A3-4F67-94DE-09087FC9554E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{794D24A4-83A3-4F67-94DE-09087FC9554E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{819E87B2-A320-E7BB-96D6-D3592826755C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{819E87B2-A320-E7BB-96D6-D3592826755C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{819E87B2-A320-E7BB-96D6-D3592826755C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{819E87B2-A320-E7BB-96D6-D3592826755C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A138DCE-DAAF-6D45-750E-24C967185836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A138DCE-DAAF-6D45-750E-24C967185836}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A138DCE-DAAF-6D45-750E-24C967185836}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A138DCE-DAAF-6D45-750E-24C967185836}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

FixVectorLeak

@@ -1,15 +1,14 @@
-using Microsoft.Extensions.Logging;
-using System.Runtime.InteropServices;
+using AntiRush.Classes;
+using AntiRush.Enums;
+using AntiRush.Extensions;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
-using AntiRush.Classes;
-using AntiRush.Enums;
-using AntiRush.Extensions;
 using CSSharpUtils.Extensions;
 using CSSharpUtils.Utils;
-using FixVectorLeak.src;
-using FixVectorLeak.src.Structs;
+using FixVectorLeak.Extensions;
+using FixVectorLeak.Structs;
+using Microsoft.Extensions.Logging;
 
 namespace AntiRush;
 
@@ -49,24 +48,22 @@ public override void Load(bool isReload)
                 Server.ExecuteCommand("mp_restartgame 1");
         });
 
-        _isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
-
         Logger.LogInformation("{ModuleName} loaded successfully!", ModuleName);
-        _ProcessMovement = new(GameData.GetSignature("RunCommand"));
-        _ProcessMovement!.Hook(OnProcessMovement, HookMode.Pre);
     }
 
     public override void Unload(bool isReload)
     {
         Logger.LogInformation("{ModuleName} unloaded successfully!", ModuleName);
-        _ProcessMovement!.Unhook(OnProcessMovement, HookMode.Pre);
     }
 
     private void SaveZone(CCSPlayerController player)
     {
-        var menu = _playerData[player].AddZoneMenu;
-        _playerData[player].AddZone?.Clear();
-         
+        if (!_playerData.TryGetValue(player, out var playerData))
+            return;
+
+        var menu = playerData.AddZoneMenu;
+        playerData.AddZone?.Clear();
+
         CsTeam[] teams = menu!.Items[1].Option switch
         {
             0 => [CsTeam.Terrorist, CsTeam.CounterTerrorist],
@@ -76,8 +73,8 @@ private void SaveZone(CCSPlayerController player)
         };
 
         var zoneType = (ZoneType)menu.Items[0].Option;
-        float[] minPoint = [Math.Min(menu.Points[0]!.Value.X, menu.Points[1]!.Value.X), Math.Min(menu.Points[0]!.Value.Y, menu.Points[1]!.Value.Y), Math.Min(menu.Points[0]!.Value.Z, menu.Points[1]!.Value.Z)];
-        float[] maxPoint = [Math.Max(menu.Points[0]!.Value.X, menu.Points[1]!.Value.X), Math.Max(menu.Points[0]!.Value.Y, menu.Points[1]!.Value.Y), Math.Max(menu.Points[0]!.Value.Z, menu.Points[1]!.Value.Z)];
+        var minPoint = new Vector_t(Math.Min(menu.Points[0]!.Value.X, menu.Points[1]!.Value.X), Math.Min(menu.Points[0]!.Value.Y, menu.Points[1]!.Value.Y), Math.Min(menu.Points[0]!.Value.Z, menu.Points[1]!.Value.Z));
+        var maxPoint = new Vector_t(Math.Max(menu.Points[0]!.Value.X, menu.Points[1]!.Value.X), Math.Max(menu.Points[0]!.Value.Y, menu.Points[1]!.Value.Y), Math.Max(menu.Points[0]!.Value.Z, menu.Points[1]!.Value.Z));
         var delay = zoneType != ZoneType.Bounce && float.TryParse(menu.Items[3].DataString, out var valueDelay) ? (float)Math.Floor(valueDelay * 10) / 10 : 0;
         var damage = zoneType == ZoneType.Hurt && int.TryParse(menu.Items[4].DataString, out var valueDamage) ? valueDamage : 0;
         var name = menu.Items[2].DataString;
@@ -106,9 +103,6 @@ private void SaveZone(CCSPlayerController player)
 
         if (Config.DrawZones)
             zone.Draw();
-
-        if (_playerData.TryGetValue(player, out var playerData))
-            playerData.AddZone?.Clear();
     }
 
     private bool PrintAction(CCSPlayerController player, Zone zone)
@@ -153,16 +147,17 @@ private void DoAction(CCSPlayerController player, Zone zone)
         if (player.PlayerPawn.Value?.MovementServices is null)
             return;
 
-        if (PrintAction(player, zone))
-            _playerData[player].LastMessage = Server.CurrentTime;
+        if (!_playerData.TryGetValue(player, out var playerData))
+            return;
 
-        if (zone.Type is (ZoneType.Bounce or ZoneType.Wall))
-            _playerData[player].BlockButtons = Server.TickedTime + 0.3;
+        if (PrintAction(player, zone))
+            playerData.LastMessage = Server.CurrentTime;
 
         switch (zone.Type)
         {
             case ZoneType.Bounce:
-                player.Bounce(_playerData[player].LastPos, _playerData[player].LastVel);
+                if (playerData.LastPos is not null && playerData.LastVel is not null)
+                    player.Bounce((Vector_t)playerData.LastPos, (Vector_t)playerData.LastVel);
 
                 return;
 
@@ -177,13 +172,15 @@ private void DoAction(CCSPlayerController player, Zone zone)
                 return;
 
             case ZoneType.Teleport:
-                if (_playerData[player].SpawnPos is not null)
-                    player.PlayerPawn.Value.Teleport(_playerData[player].SpawnPos, velocity: new Vector_t());
+                if (playerData.SpawnPos is not null)
+                    player.PlayerPawn.Value.Teleport(playerData.SpawnPos, velocity: new Vector_t());
 
                 return;
 
             case ZoneType.Wall:
-                player.PlayerPawn.Value.Teleport(new Vector_t(_playerData[player].LastPos[0], _playerData[player].LastPos[1], _playerData[player].LastPos[2]), velocity: new Vector_t());
+                if (playerData.LastPos is not null)
+                    player.PlayerPawn.Value.Teleport(playerData.LastPos, velocity: new Vector_t());
+
                 return;
         }
     }

gamedata/AntiRush.json

@@ -4,20 +4,18 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="CounterStrikeSharp.API" Version="*" ExcludeAssets="runtime" />
 		<ProjectReference Include="..\CSSharpUtils\CSSharpUtils\CSSharpUtils.csproj" />
-		<ProjectReference Include="..\FixVectorLeak\FixVectorLeak.csproj" />
+		<ProjectReference Include="..\FixVectorLeak\src\FixVectorLeak.csproj" />
 		<ProjectReference Include="..\Menu\src\Menu.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<Content Include="..\lang\**\*.*">
+		<Content Include="..\lang\**\*.*" CopyToOutputDirectory="PreserveNewest" >
 			<Link>%(RecursiveDir)\lang\%(Filename)%(Extension)</Link>
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
 

src/AntiRush.cs

@@ -1,5 +1,5 @@
 using AntiRush.Enums;
-using FixVectorLeak.src.Structs;
+using FixVectorLeak.Structs;
 
 namespace AntiRush.Classes;
 
@@ -11,7 +11,6 @@ public class PlayerData
     public bool Debug { get; set; }
     public bool[] DebugOptions { get; set; } = new bool[Enum.GetValues(typeof(ZoneType)).Length];
     public Vector_t? SpawnPos { get; set; } = null;
-    public float[] LastPos { get; set; } = [];
-    public float[] LastVel { get; set; } = [];
-    public double BlockButtons { get; set; } = 0;
+    public Vector_t? LastPos { get; set; } = null;
+    public Vector_t? LastVel { get; set; } = null;
 }

src/AntiRush.csproj

@@ -1,7 +1,7 @@
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Commands;
-using AntiRush.Enums;
+using AntiRush.Enums;
 using AntiRush.Extensions;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Commands;
 using CSSharpUtils.Extensions;
 
 namespace AntiRush;