Merge pull request #349 from shobhit-pathak/dev

shobhit-pathak · web-flow · commit ad749fa0388a · 2025-10-21T20:50:18.000+05:30
0.8.14
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # MatchZy Changelog
 
+# 0.8.14
+
+#### October 21, 2025
+
+- Bumped CSS Version.
+- Added .savepos and .loadpos commands in practice mode.
+- Fixed noclip not getting disabled after switching out from practice mode.
+- Fixed issues with rethrow of smoke / molly / nade.
+- Fixed .rethrow always throwing incendiary instead of molotov. 
+- Fixed `RemoteLogHeaderValue` value while resetting the match.
+
 # 0.8.13
 
 #### September 03, 2025
diff --git a/ConsoleCommands.cs b/ConsoleCommands.cs
@@ -712,5 +712,24 @@ public void OnVersionCommand(CCSPlayerController? player, CommandInfo? command)
             // Currently returning only server version to show server status as available on Get5
             command.ReplyToCommand((serverVersion != null) ? $"Protocol version {serverVersion} [{serverVersion}/{serverVersion}]" : "Unable to get server version");
         }
+
+        // Overrides noclip console command. Perform the changes on server side.
+        public HookResult OnConsoleNoClip(CCSPlayerController? player, CommandInfo cmd) {
+            if (player == null || !player.PawnIsAlive || player.Team == CsTeam.Spectator || player.Team == CsTeam.None)
+                return HookResult.Stop;
+
+            // inspired by cs2-noclip
+            if (player.PlayerPawn.Value!.MoveType == MoveType_t.MOVETYPE_NOCLIP) {
+                player.PlayerPawn.Value.MoveType = MoveType_t.MOVETYPE_WALK;
+                player.PlayerPawn.Value.ActualMoveType = MoveType_t.MOVETYPE_WALK;
+                Utilities.SetStateChanged(player.PlayerPawn.Value, "CBaseEntity", "m_MoveType");
+            } else {
+                player.PlayerPawn.Value.MoveType = MoveType_t.MOVETYPE_NOCLIP;
+                player.PlayerPawn.Value.ActualMoveType = MoveType_t.MOVETYPE_OBSERVER;
+                Utilities.SetStateChanged(player.PlayerPawn.Value, "CBaseEntity", "m_MoveType");
+            }
+
+            return HookResult.Stop;
+        }
     }
 }
diff --git a/EventHandlers.cs b/EventHandlers.cs
@@ -247,7 +247,8 @@ public void OnEntitySpawnedHandler(CEntityInstance entity)
                     player.PlayerPawn.Value.CBodyComponent!.SceneNode!.AbsOrigin, 
                     player.PlayerPawn.Value.EyeAngles,
                     nadeType,
-                    DateTime.Now
+                    DateTime.Now,
+                    projectile.ItemIndex
                 );
 
                 nadeSpecificLastGrenadeData[client][nadeType] = lastGrenadeThrown;
diff --git a/GrenadeProjectiles.cs b/GrenadeProjectiles.cs
@@ -0,0 +1,40 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
+using System.Runtime.InteropServices;
+
+
+namespace MatchZy;
+
+public static class GrenadeFunctions
+{
+
+    public static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+
+    public static MemoryFunctionWithReturn<IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, int, int, CSmokeGrenadeProjectile>
+        CSmokeGrenadeProjectile_CreateFunc = new(
+            IsLinux
+                ? @"55 4C 89 C1 48 89 E5 41 57 45 89 CF 41 56 49 89 FE"
+                : @"48 8B C4 48 89 58 ? 48 89 68 ? 48 89 70 ? 57 41 56 41 57 48 81 EC ? ? ? ? 48 8B B4 24 ? ? ? ? 4D 8B F8"
+        );
+
+    public static MemoryFunctionWithReturn<IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, int, CHEGrenadeProjectile>
+        CHEGrenadeProjectile_CreateFunc = new(
+            IsLinux
+                ? "55 4C 89 C1 48 89 E5 41 57 49 89 D7"
+                : "48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 83 EC 50 48 8B AC 24 80 00 00 00 49 8B F8"
+        );
+    
+    public static MemoryFunctionWithReturn<IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, int, CMolotovProjectile>
+        CMolotovProjectile_CreateFunc = new(
+            IsLinux
+                ? "55 48 8D 05 ? ? ? ? 48 89 E5 41 57 41 56 41 55 41 54 49 89 FC 53 48 81 EC ? ? ? ? 4C 8D 35"
+                : "48 8B C4 48 89 58 10 4C 89 40 18 48 89 48 08"
+        );
+    
+    public static MemoryFunctionWithReturn<IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, int, CDecoyProjectile>
+        CDecoyProjectile_CreateFunc = new(
+            IsLinux
+                ? "55 4C 89 C1 48 89 E5 41 57 45 89 CF 41 56 49 89 D6 48 89 F2 48 89 FE 41 55 49 89 FD 41 54 48 8D 3D ?? ?? ?? ?? 4D 89 C4 53 48 83 EC ?? E8 ?? ?? ?? ?? 45 31 C0"
+                : "48 8B C4 55 56 48 81 EC 68 01 00 00"
+        );
+}
diff --git a/GrenadeThrownData.cs b/GrenadeThrownData.cs
@@ -21,7 +21,9 @@ public class GrenadeThrownData
 
     public float Delay { get; set; }
 
-    public GrenadeThrownData(Vector nadePosition, QAngle nadeAngle, Vector nadeVelocity, Vector playerPosition, QAngle playerAngle, string grenadeType, DateTime thrownTime)
+    public UInt16 ItemIndex { get; set; }
+
+    public GrenadeThrownData(Vector nadePosition, QAngle nadeAngle, Vector nadeVelocity, Vector playerPosition, QAngle playerAngle, string grenadeType, DateTime thrownTime, UInt16 itemIndex)
     {
         Position = new Vector(nadePosition.X, nadePosition.Y, nadePosition.Z);
         Angle = new QAngle(nadeAngle.X, nadeAngle.Y, nadeAngle.Z);
@@ -31,6 +33,7 @@ public GrenadeThrownData(Vector nadePosition, QAngle nadeAngle, Vector nadeVeloc
         Type = grenadeType;
         ThrownTime = thrownTime;
         Delay = 0;
+        ItemIndex = itemIndex;
     }
 
     public void LoadPosition(CCSPlayerController player)
@@ -41,38 +44,86 @@ public void LoadPosition(CCSPlayerController player)
 
     public void Throw(CCSPlayerController player)
     {
-        if (Type == "smoke")
-        {
-            SmokeGrenadeProjectile.Create(Position, Angle, Velocity, player);
-        }
-        else if (Type == "flash" || Type == "hegrenade" || Type == "decoy" || Type == "molotov")
-        {
-            var entity = Utilities.CreateEntityByName<CBaseCSGrenadeProjectile>(Constants.NadeProjectileMap[Type]);
-            if (entity == null)
-            {
-                Console.WriteLine($"[GrenadeThrownData Fatal] Failed to create entity!");
-                return;
-            }
-            if (Type == "molotov") entity.SetModel("weapons/models/grenade/incendiary/weapon_incendiarygrenade.vmdl");
-            entity.Elasticity = 0.33f;
-            entity.IsLive = false;
-            entity.DmgRadius = 350.0f;
-            entity.Damage = 99.0f;
-            entity.InitialPosition.X = Position.X;
-            entity.InitialPosition.Y = Position.Y;
-            entity.InitialPosition.Z = Position.Z;
-            entity.InitialVelocity.X = Velocity.X;
-            entity.InitialVelocity.Y = Velocity.Y;
-            entity.InitialVelocity.Z = Velocity.Z;
-            entity.Teleport(Position, Angle, Velocity);
-            entity.DispatchSpawn();
-            entity.Globalname = "custom";
-            entity.AcceptInput("FireUser1", player, player);
-            entity.AcceptInput("InitializeSpawnFromWorld");
-            entity.TeamNum = player.TeamNum;
-            entity.Thrower.Raw = player.PlayerPawn.Raw;
-            entity.OriginalThrower.Raw = player.PlayerPawn.Raw;
-            entity.OwnerEntity.Raw = player.PlayerPawn.Raw;
-        }
+		CBaseCSGrenadeProjectile? grenadeEntity = null;
+		switch (Type)
+		{
+			case "smoke":
+			{
+				grenadeEntity = GrenadeFunctions.CSmokeGrenadeProjectile_CreateFunc.Invoke(
+					Position.Handle,
+					Angle.Handle,
+					Velocity.Handle,
+					Velocity.Handle,
+					IntPtr.Zero,
+					ItemIndex,
+					(int)player.Team);
+				break;
+			}
+			case "molotov":
+			{
+				grenadeEntity = GrenadeFunctions.CMolotovProjectile_CreateFunc.Invoke(
+					Position.Handle,
+					Angle.Handle,
+					Velocity.Handle,
+					Velocity.Handle,
+					IntPtr.Zero,
+					ItemIndex);
+				break;
+			}
+			case "hegrenade":
+			{
+				grenadeEntity = GrenadeFunctions.CHEGrenadeProjectile_CreateFunc.Invoke(
+					Position.Handle,
+					Angle.Handle,
+					Velocity.Handle,
+					Velocity.Handle,
+					IntPtr.Zero,
+					ItemIndex);
+				break;
+			}
+			case "decoy":
+			{
+				grenadeEntity = GrenadeFunctions.CDecoyProjectile_CreateFunc.Invoke(
+					Position.Handle,
+					Angle.Handle,
+					Velocity.Handle,
+					Velocity.Handle,
+					IntPtr.Zero,
+					ItemIndex);
+				break;
+			}
+			case "flash":
+			{
+				grenadeEntity = Utilities.CreateEntityByName<CFlashbangProjectile>("flashbang_projectile");
+				if (grenadeEntity == null) return;
+				grenadeEntity.DispatchSpawn();
+				break;
+			}
+			default:
+				Console.WriteLine($"[MatchZy] Unknown Grenade: {Type}");
+				break;
+		}
+
+		if (grenadeEntity != null && grenadeEntity.DesignerName != "smokegrenade_projectile")
+		{
+			grenadeEntity.InitialPosition.X = Position.X;
+			grenadeEntity.InitialPosition.Y = Position.Y;
+			grenadeEntity.InitialPosition.Z = Position.Z;
+
+			grenadeEntity.InitialVelocity.X = Velocity.X;
+			grenadeEntity.InitialVelocity.Y = Velocity.Y;
+			grenadeEntity.InitialVelocity.Z = Velocity.Z;
+
+			grenadeEntity.AngVelocity.X = Velocity.X;
+			grenadeEntity.AngVelocity.Y = Velocity.Y;
+			grenadeEntity.AngVelocity.Z = Velocity.Z;
+
+            grenadeEntity.Teleport(Position, Angle, Velocity);
+            grenadeEntity.Globalname = "custom";
+            grenadeEntity.TeamNum = player.TeamNum;
+            grenadeEntity.Thrower.Raw = player.PlayerPawn.Raw;
+            grenadeEntity.OriginalThrower.Raw = player.PlayerPawn.Raw;
+            grenadeEntity.OwnerEntity.Raw = player.PlayerPawn.Raw;
+		}
     }
 }
diff --git a/MatchZy.cs b/MatchZy.cs
@@ -14,7 +14,7 @@ public partial class MatchZy : BasePlugin
 
         public override string ModuleName => "MatchZy";
 
-        public override string ModuleVersion => "0.8.13";
+        public override string ModuleVersion => "0.8.14";
 
         public override string ModuleAuthor => "WD- (https://github.com/shobhit-pathak/)";
 
@@ -263,6 +263,8 @@ public override void Load(bool hotReload) {
                 return HookResult.Continue;
             });
 
+            AddCommandListener("noclip", OnConsoleNoClip); // Override noclip
+
             RegisterEventHandler<EventRoundEnd>((@event, info) => 
             {
                 if (!isKnifeRound) return HookResult.Continue;
diff --git a/MatchZy.csproj b/MatchZy.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.338">
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.342">
         <PrivateAssets>none</PrivateAssets>
         <ExcludeAssets>runtime</ExcludeAssets>
         <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/PracticeMode.cs b/PracticeMode.cs
@@ -1074,13 +1074,22 @@ public HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
             var player = @event.Userid;
             if (!IsPlayerValid(player)) return HookResult.Continue;
 
+            // disable noclip on spawn -- all no clipping functionality is handled by the plugin!
+            // Movement adjustments are consistent with cs2-noclip.
+            CBasePlayerPawn pawn = player!.PlayerPawn.Value!;
+            if (pawn.MoveType == MoveType_t.MOVETYPE_NOCLIP) {
+                pawn.MoveType = MoveType_t.MOVETYPE_WALK;
+                pawn.ActualMoveType = MoveType_t.MOVETYPE_WALK;
+                Utilities.SetStateChanged(pawn, "CBaseEntity", "m_MoveType");
+            }
+
             if (matchStarted && (matchzyTeam1.coach.Contains(player!) || matchzyTeam2.coach.Contains(player!)))
             {
                 player!.InGameMoneyServices!.Account = 0;
 
                 Utilities.SetStateChanged(player, "CCSPlayerController", "m_pInGameMoneyServices");
-                player.PlayerPawn.Value!.MoveType = MoveType_t.MOVETYPE_NONE;
-                player.PlayerPawn.Value!.ActualMoveType = MoveType_t.MOVETYPE_NONE;
+                pawn.MoveType = MoveType_t.MOVETYPE_NONE;
+                pawn.ActualMoveType = MoveType_t.MOVETYPE_NONE;
                 
                 return HookResult.Continue;
             }
diff --git a/SmokeGrenadeProjectile.cs b/SmokeGrenadeProjectile.cs
diff --git a/Utility.cs b/Utility.cs
@@ -350,7 +350,6 @@ private void KillPhaseTimers()
             pausedStateTimer = null;
         }
 
-
         private (int alivePlayers, int totalHealth) GetAlivePlayers(int team)
         {
             int count = 0;
@@ -472,7 +471,7 @@ private void ResetMatch(bool warmupCfgRequired = true)
                 {
                     RemoteLogURL = matchConfig.RemoteLogURL,
                     RemoteLogHeaderKey = matchConfig.RemoteLogHeaderKey,
-                    RemoteLogHeaderValue = matchConfig.RemoteLogURL
+                    RemoteLogHeaderValue = matchConfig.RemoteLogHeaderValue
                 };
 
                 KillPhaseTimers();

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,6 @@ private void KillPhaseTimers()`
`350`	`350`	`pausedStateTimer = null;`
`351`	`351`	`}`
`352`	`352`
`353`		`-`
`354`	`353`	`private (int alivePlayers, int totalHealth) GetAlivePlayers(int team)`
`355`	`354`	`{`
`356`	`355`	`int count = 0;`
`@@ -472,7 +471,7 @@ private void ResetMatch(bool warmupCfgRequired = true)`
`472`	`471`	`{`
`473`	`472`	`RemoteLogURL = matchConfig.RemoteLogURL,`
`474`	`473`	`RemoteLogHeaderKey = matchConfig.RemoteLogHeaderKey,`
`475`		`- RemoteLogHeaderValue = matchConfig.RemoteLogURL`
	`474`	`+ RemoteLogHeaderValue = matchConfig.RemoteLogHeaderValue`
`476`	`475`	`};`
`477`	`476`
`478`	`477`	`KillPhaseTimers();`