Merge pull request #7 from edgegamers/main

dasd
MSWS · Jul 11, 2024 · de03ff1 · de03ff1
2 parents e31188c + 772d65c
commit de03ff1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/mod/TTT.Logs/LogsCommand.cs b/mod/TTT.Logs/LogsCommand.cs
@@ -32,15 +32,16 @@ public void Command_Logs(CCSPlayerController? executor, CommandInfo info)
 
         var roundId = service.GetCurrentRound();
 
-        if (!string.IsNullOrEmpty(roundIdString) || !int.TryParse(roundIdString, out roundId))
+        if (string.IsNullOrEmpty(roundIdString) && !int.TryParse(roundIdString, out roundId))
         {
-            info.ReplyToCommand(StringUtils.FormatTTT("Invalid round id"));
+            info.ReplyToCommand(StringUtils.FormatTTT("Invalid round id, /logs <roundId>"));
             return;
         }
 
         if (roundId <= 0)
         {
             info.ReplyToCommand( StringUtils.FormatTTT("Invalid round id"));
+            return;
         }
 
         if (executor == null)
@@ -59,4 +60,4 @@ public void Command_Logs(CCSPlayerController? executor, CommandInfo info)
             ? StringUtils.FormatTTT("No logs found for round " + roundId)
             : StringUtils.FormatTTT("Logs printed to console"));
     }
-}
+}
diff --git a/mod/TTT.Roles/RoleBehavior.cs b/mod/TTT.Roles/RoleBehavior.cs
@@ -63,7 +63,7 @@ public HookResult OnRoundStart(EventRoundFreezeEnd @event, GameEventInfo info)
             if (!string.IsNullOrEmpty(string.Empty))
                 player.GiveNamedItem(string.Empty);
 
-            player.GiveNamedItem("weapon_glock");
+            player.GiveNamedItem("weapon_knife");
             service.GetPlayer(player).ModifyKarma();
         }
 
@@ -107,8 +107,6 @@ public HookResult OnPlayerDeath(EventPlayerDeath @event, GameEventInfo info)
 
         if (_traitorsLeft == 0 || _innocentsLeft == 0) Server.NextFrame(() => _roundService.ForceEnd());
 
-        Server.NextFrame(() => playerWhoWasDamaged.CommitSuicide(false, true));
-
         Server.NextFrame(() =>
         {
             Server.PrintToChatAll(

diff --git a/mod/TTT.Round/Round.cs b/mod/TTT.Round/Round.cs
@@ -13,14 +13,14 @@ public class Round
 {
     private readonly IRoleService _roleService;
     private readonly RoundConfig? _config;
-    private float _graceTime = 20;
+    private float _graceTime = 20 * 64;
     private readonly int _roundId;
 
     public Round(IRoleService roleService, RoundConfig? config, int roundId)
     {
         _roleService = roleService;
         _config = config;
-        _graceTime = 20;
+        _graceTime = 20 * 64;
         _roundId = roundId;
     }
 
@@ -103,4 +103,4 @@ private void SendDetectiveMessage()
             }
         }
     }
-}
+}