jRandomSkills - SRC Files/src/command/Command.cs

@@ -228,15 +228,6 @@ namespace src.command
                 Reply("error_setskill");
         }
 
-        // zio: one player for commands that take a single target (css_setstaticskill, css_next): the
-        // css_setskill rules, so part of a name works, but only when it picks out one player.
-        private static CCSPlayerController? GetSinglePlayerTarget(CCSPlayerController? caller, string arg)
-        {
-            if (string.IsNullOrEmpty(arg)) return null;
-            var targets = GetSetSkillTargets(caller, arg, _ => true);
-            return targets.Count == 1 ? targets[0] : null;
-        }
-
         // zio: css_setskill targets. An exact name or SteamID64 as before, CSS's own selectors
         // (@me, @all, @ct, @t, @alive, #userid, ...), or @random/@randomct/@randomt: one random
         // alive player, drawn only from players the skill's team restriction allows.
@@ -583,7 +574,9 @@ namespace src.command
         {
             Debug.WriteToDebug($"Player {player?.PlayerName} used the css_setstaticskill {command.ArgString} command.");
             if (!string.IsNullOrEmpty(config.NormalCommands.SetStaticSkillCommand.Permissions) && !AdminManager.PlayerHasPermissions(player, config.NormalCommands.SetStaticSkillCommand.Permissions)) return;
-            var targetPlayer = GetSinglePlayerTarget(player, command.GetArg(1));
+            var targetPlayer = Utilities.GetPlayers().FirstOrDefault(p => p != null && p.IsValid
+                                                                          && (p.SteamID.ToString().Equals(command.GetArg(1), StringComparison.CurrentCultureIgnoreCase)
+                                                                          || p.PlayerName.Equals(command.GetArg(1), StringComparison.OrdinalIgnoreCase)));
 
             if (command.ArgCount < 2)
             {
@@ -730,7 +723,9 @@ namespace src.command
 
             if (!string.IsNullOrEmpty(playerString))
             {
-                targetPlayer = GetSinglePlayerTarget(player, playerString);
+                targetPlayer = Utilities.GetPlayers().FirstOrDefault(p => p != null && p.IsValid
+                                                                  && (p.SteamID.ToString().Equals(playerString, StringComparison.CurrentCultureIgnoreCase)
+                                                                  || p.PlayerName.Equals(playerString, StringComparison.OrdinalIgnoreCase)));
                 
                 if (targetPlayer == null)
                 {

jRandomSkills - SRC Files/src/jRandomSkills.cs

@@ -44,7 +44,7 @@ namespace src
         public override string ModuleName => "[CS2] [ jRandomSkills ]";
         public override string ModuleAuthor => "D3X (Original), Juzlus (Modifier), ByDexterTR (Contributor)";
         public override string ModuleDescription => "Plugin adds random skills every round for CS2 by D3X. Modified by Juzlus.";
-        public override string ModuleVersion => "1.2.4.b3-panorama5";
+        public override string ModuleVersion => "1.2.4.b3-panorama4";
 
         public override void Load(bool hotReload)
         {

release.sh

@@ -29,13 +29,8 @@ set -euo pipefail
 FORGEJO_URL="https://git.zio.sh"
 OWNER="cs2"
 REPO="jRandomSkills"
-# Needs write:repository. Only uploading needs it; downloading from the public repo doesn't. From the
+# Placeholder - replace, or set FORGEJO_TOKEN in the environment instead. Needs write:repository.
-# environment, or else from .forgejo-token in the cs2/ folder above every plugin (outside their
+# Only uploading needs it; downloading from the public repo doesn't. Don't commit a real token.
-# repos, mode 600). Don't commit a real token.
-TOKEN_FILE="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")/../../.forgejo-token"
-if [[ -z "${FORGEJO_TOKEN:-}" && -r "$TOKEN_FILE" ]]; then
-    FORGEJO_TOKEN="$(tr -d '[:space:]' < "$TOKEN_FILE")"
-fi
 FORGEJO_TOKEN="${FORGEJO_TOKEN:-CHANGE_ME_FORGEJO_TOKEN}"
 
 # CS2 client used to compile the Panorama layouts, and the Workshop Tools addon compiled into.
@@ -65,7 +60,7 @@ if [[ -z "$TAG" ]]; then
     exit 1
 fi
 if [[ "$FORGEJO_TOKEN" == "CHANGE_ME_FORGEJO_TOKEN" ]]; then
-    echo "Set FORGEJO_TOKEN (export it, or put it in $TOKEN_FILE) first." >&2
+    echo "Set FORGEJO_TOKEN (edit release.sh or export it) first." >&2
     exit 1
 fi