Merge pull request #332 from shobhit-pathak/dev

0.8.13

Author: shobhit-pathak

CHANGELOG.md

@@ -1,5 +1,14 @@
 # MatchZy Changelog
 
+# 0.8.13
+
+#### September 03, 2025
+
+- Fixed coach bomb bug and updated CSS version.
+- Added `matchzy_demo_recording_enabled` convar to toggle demo recording.
+- Fixed the Map Winner Logic in MapWinner event
+- Fixed first Map Name in database stats
+
 # 0.8.12
 
 #### August 25, 2025

Coach.cs

@@ -122,7 +122,7 @@ public void HandleCoaches()
             // Elevating coach before dropping the C4 to prevent it going inside the ground.
             AddTimer(0.05f, () =>
             {
-                coach!.PlayerPawn.Value!.Teleport(new Vector(coachPosition.PlayerPosition.X, coachPosition.PlayerPosition.Y, coachPosition.PlayerPosition.Z + 20.0f), coachPosition.PlayerAngle, new Vector(0, 0, 0));
+                // coach!.PlayerPawn.Value!.Teleport(new Vector(coachPosition.PlayerPosition.X, coachPosition.PlayerPosition.Y, coachPosition.PlayerPosition.Z + 20.0f), coachPosition.PlayerAngle, new Vector(0, 0, 0));
                 HandleCoachWeapons(coach);
                 coach!.PlayerPawn.Value.Teleport(newPosition.PlayerPosition, newPosition.PlayerAngle, new Vector(0, 0, 0));
             });
@@ -180,10 +180,36 @@ public void HandleCoaches()
     private void HandleCoachWeapons(CCSPlayerController coach)
     {
         if (!IsPlayerValid(coach)) return;
-        DropWeaponByDesignerName(coach, "weapon_c4");
         coach.RemoveWeapons();
     }
 
+    /// <summary>
+    /// Transfers bomb from coach to first available non-coach terrorist.
+    /// </summary> 
+    public void TransferCoachBomb(CCSPlayerController coach) {
+        if (coach.TeamNum != (int)CsTeam.Terrorist) return; // can't have bomb
+
+        // find bomb and new target
+        var bomb = coach.PlayerPawn.Value!.WeaponServices!.MyWeapons
+            .Where(w => w != null && w.IsValid && w.Value!.DesignerName == "weapon_c4")
+            .FirstOrDefault();
+        if (bomb == null || bomb.Value == null) return; // should never trigger
+
+        var target = Utilities.GetPlayers()
+            .FirstOrDefault(
+                p => IsPlayerValid(p)
+                && !reverseTeamSides["TERRORIST"].coach.Contains(p)
+                && p.TeamNum == (int)CsTeam.Terrorist
+                && p.PawnIsAlive
+            );
+        if (!IsPlayerValid(target)) return; // should never trigger
+
+        // transfer bomb
+        Log($"[EventPlayerGivenC4 INFO] Transferred bomb from {coach.PlayerName} (Coach) to {target.PlayerName}.");
+        bomb.Value!.Remove();
+        target.GiveNamedItem("weapon_c4");
+    }
+
     public CsTeam GetCoachTeam(CCSPlayerController coach)
     {
         if (matchzyTeam1.coach.Contains(coach))
@@ -240,8 +266,6 @@ private void KillCoaches()
 
             Position coachPosition = new(coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsOrigin, coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsRotation);
             coach!.PlayerPawn.Value!.Teleport(new Vector(coachPosition.PlayerPosition.X, coachPosition.PlayerPosition.Y, coachPosition.PlayerPosition.Z + 20.0f), coachPosition.PlayerAngle, new Vector(0, 0, 0));
-            // Dropping the C4 if it was picked up or passed to the coach.
-            DropWeaponByDesignerName(coach, "weapon_c4");
             coach.PlayerPawn.Value!.CommitSuicide(explode: false, force: true);
         }
         Server.ExecuteCommand($"mp_suicide_penalty {suicidePenalty}; spec_freeze_time {specFreezeTime}; spec_freeze_time_lock {specFreezeTimeLock}; spec_freeze_deathanim_time {specFreezeDeathanim};");

ConfigConvars.cs

@@ -125,6 +125,15 @@ public void MatchZyDemoNameFormat(CCSPlayerController? player, CommandInfo comma
             }
         }
 
+        [ConsoleCommand("matchzy_demo_recording_enabled", "Whether to automatically start demo recording when the match goes live. Default value: true")]
+        public void MatchZyDemoRecordingEnabled(CCSPlayerController? player, CommandInfo command)
+        {
+            if (player != null) return;
+            string args = command.ArgString;
+
+            isDemoRecordingEnabled = bool.TryParse(args, out bool isDemoRecordingEnabledValue) ? isDemoRecordingEnabledValue : args != "0" && isDemoRecordingEnabled;
+        }
+
         [ConsoleCommand("get5_demo_upload_url", "If defined, recorded demos will be uploaded to this URL once the map ends.")]
         [ConsoleCommand("matchzy_demo_upload_url", "If defined, recorded demos will be uploaded to this URL once the map ends.")]
         public void MatchZyDemoUploadURL(CCSPlayerController? player, CommandInfo command)

DatabaseStats.cs

@@ -229,11 +229,11 @@ FOREIGN KEY (mapnumber) REFERENCES matchzy_stats_maps (mapnumber)
             )");
         }
 
-        public long InitMatch(string team1name, string team2name, string serverIp, bool isMatchSetup, long liveMatchId, int mapNumber, string seriesType)
+        public long InitMatch(string team1name, string team2name, string serverIp, bool isMatchSetup, long liveMatchId, int mapNumber, string seriesType, MatchConfig matchConfig)
         {
             try
             {
-                string mapName = Server.MapName;
+                string mapName = isMatchSetup ? matchConfig.Maplist[mapNumber] : Server.MapName;
                 string dateTimeExpression = (connection is SqliteConnection) ? "datetime('now')" : "NOW()";
 
                 if (mapNumber == 0) {

DemoManagement.cs

@@ -20,9 +20,15 @@ public partial class MatchZy
         public string activeDemoFile = "";
 
         public bool isDemoRecording = false;
+        public bool isDemoRecordingEnabled = true;
 
         public void StartDemoRecording()
         {
+            if (!isDemoRecordingEnabled)
+            {
+                Log("[StartDemoRecording] Demo recording is disabled.");
+                return;
+            }
             if (isDemoRecording)
             {
                 Log("[StartDemoRecording] Demo recording is already in progress.");

EventHandlers.cs

@@ -171,12 +171,9 @@ public HookResult EventRoundFreezeEndHandler(EventRoundFreezeEnd @event, GameEve
 
                 Position coachPosition = new(coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsOrigin, coach.PlayerPawn.Value!.CBodyComponent!.SceneNode!.AbsRotation);
                 coach!.PlayerPawn.Value!.Teleport(new Vector(coachPosition.PlayerPosition.X, coachPosition.PlayerPosition.Y, coachPosition.PlayerPosition.Z + 20.0f), coachPosition.PlayerAngle, new Vector(0, 0, 0));
-                // Dropping the C4 if it was picked up or passed to the coach.
-                DropWeaponByDesignerName(coach, "weapon_c4");
                 AddTimer(1.5f, () =>
                 {
                     coach!.PlayerPawn.Value!.Teleport(new Vector(coachPosition.PlayerPosition.X, coachPosition.PlayerPosition.Y, coachPosition.PlayerPosition.Z + 20.0f), coachPosition.PlayerAngle, new Vector(0, 0, 0));
-                    DropWeaponByDesignerName(coach, "weapon_c4");
                     CsTeam oldTeam = GetCoachTeam(coach);
                     coach.ChangeTeam(CsTeam.Spectator);
                     AddTimer(0.01f, () => coach.ChangeTeam(oldTeam));
@@ -191,6 +188,23 @@ public HookResult EventRoundFreezeEndHandler(EventRoundFreezeEnd @event, GameEve
         }
     }
 
+    public HookResult EventPlayerGivenC4(EventPlayerGivenC4 @event, GameEventInfo info) {
+        try {
+            if (!matchStarted) return HookResult.Continue;
+            if (@event.Userid == null) return HookResult.Continue;
+            var recv = @event.Userid;
+
+            // check if coach
+            var coaches = reverseTeamSides["TERRORIST"].coach;
+            if (coaches.Contains(recv)) {
+                TransferCoachBomb(recv);
+            }
+        } catch (Exception e) {
+            Log($"[EventPlayerGivenC4 FATAL] An error occured: {e.Message}");
+        }
+        return HookResult.Continue;
+    }
+
     public void OnEntitySpawnedHandler(CEntityInstance entity)
     {
         try
@@ -274,7 +288,6 @@ public HookResult EventPlayerDeathPreHandler(EventPlayerDeath @event, GameEventI
                     info.DontBroadcast = true;
                 }
             }
-    
             return HookResult.Continue;
         }
         catch (Exception e)
@@ -323,7 +336,6 @@ public HookResult EventHegrenadeDetonateHandler(EventHegrenadeDetonate @event, G
         return HookResult.Continue;
     }
 
-
     public HookResult EventMolotovDetonateHandler(EventMolotovDetonate @event, GameEventInfo info)
     {
         if (!isPractice || isDryRun) return HookResult.Continue;

MatchZy.cs

@@ -13,7 +13,8 @@ public partial class MatchZy : BasePlugin
     {
 
         public override string ModuleName => "MatchZy";
-        public override string ModuleVersion => "0.8.12";
+
+        public override string ModuleVersion => "0.8.13";
 
         public override string ModuleAuthor => "WD- (https://github.com/shobhit-pathak/)";
 
@@ -208,6 +209,7 @@ public override void Load(bool hotReload) {
             RegisterEventHandler<EventCsWinPanelMatch>(EventCsWinPanelMatchHandler);
             RegisterEventHandler<EventRoundStart>(EventRoundStartHandler);
             RegisterEventHandler<EventRoundFreezeEnd>(EventRoundFreezeEndHandler);
+            RegisterEventHandler<EventPlayerGivenC4>(EventPlayerGivenC4);
             RegisterEventHandler<EventPlayerDeath>(EventPlayerDeathPreHandler, hookMode: HookMode.Pre);
             RegisterListener<Listeners.OnClientDisconnectPost>(playerSlot => { 
                // May not be required, but just to be on safe side so that player data is properly updated in dictionaries

MatchZy.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.337">
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.338">
         <PrivateAssets>none</PrivateAssets>
         <ExcludeAssets>runtime</ExcludeAssets>
         <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Utility.cs

@@ -768,7 +768,7 @@ private void HandleMatchStart()
             HandleClanTags();
 
             string seriesType = "BO" + matchConfig.NumMaps.ToString();
-            liveMatchId = database.InitMatch(matchzyTeam1.teamName, matchzyTeam2.teamName, "-", isMatchSetup, liveMatchId, matchConfig.CurrentMapNumber, seriesType);
+            liveMatchId = database.InitMatch(matchzyTeam1.teamName, matchzyTeam2.teamName, "-", isMatchSetup, liveMatchId, matchConfig.CurrentMapNumber, seriesType, matchConfig);
             SetupRoundBackupFile();
 
             GetSpawns();
@@ -874,7 +874,7 @@ private void HandleMatchEnd()
             {
                 MatchId = liveMatchId,
                 MapNumber = currentMapNumber,
-                Winner = new Winner(t1score > t2score && reverseTeamSides["CT"] == matchzyTeam1 ? "3" : "2", team1SeriesScore > team2SeriesScore ? "team1" : "team2"),
+                Winner = new Winner(t1score > t2score && reverseTeamSides["CT"] == matchzyTeam1 ? "3" : "2", t1score > t2score ? "team1" : "team2"),
                 StatsTeam1 = new MatchZyStatsTeam(matchzyTeam1.id, matchzyTeam1.teamName, team1SeriesScore, t1score, 0, 0, new List<StatsPlayer>()),
                 StatsTeam2 = new MatchZyStatsTeam(matchzyTeam2.id, matchzyTeam2.teamName, team2SeriesScore, t2score, 0, 0, new List<StatsPlayer>())
             };
@@ -1739,7 +1739,7 @@ public bool IsTacticalTimeoutActive()
 
         static string RemoveSpecialCharacters(string input)
         {
-            Regex regex = new("[^a-zA-Z0-9 _-]");
+            Regex regex = new("[^\\p{L}0-9 _-]");
             return regex.Replace(input, "");
         }
 

cfg/MatchZy/config.cfg

@@ -13,6 +13,9 @@ matchzy_knife_enabled_default true
 // Minimum ready players required to start the match. If set to 0, all connected players have to ready-up to start the match. Default: 2
 matchzy_minimum_ready_required 2
 
+// Whether to automatically start demo recording when the match goes live. Default value: true
+matchzy_demo_recording_enabled true
+
 // Path of folder in which demos will be saved. If defined, it must not start with a slash and must end with a slash. Set to empty string to use the csgo root.
 // Example: matchzy_demo_path MatchZy/
 // A folder named MatchZy will be created in csgo folder if it does not exist and will store the recorded demos in it. Default value is MatchZy/ which means demos will be stored in MatchZy/