fix 修正赠礼机器人不在线时导致的溢出问题

chr233 · Sep 5, 2024 · d904944 · d904944
1 parent bffd4da
commit d904944
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/ASFEnhance/Cart/Command.cs b/ASFEnhance/Cart/Command.cs
@@ -293,6 +293,11 @@ internal static class Command
             var targetBot = Bot.GetBot(giftee);
             if (targetBot != null)
             {
+                if (!targetBot.IsConnectedAndLoggedOn)
+                {
+                    return bot.FormatBotResponse(Strings.BotNotConnected, targetBot.BotName);
+                }
+
                 steamId32 = SteamId2Steam32(targetBot.SteamID);
             }
             else if (ulong.TryParse(giftee, out var steamId))

diff --git a/ASFEnhance/Utils.cs b/ASFEnhance/Utils.cs
@@ -88,16 +88,25 @@ internal static StringBuilder AppendLineFormat(this StringBuilder sb, string for
     /// </summary>
     /// <param name="steamId"></param>
     /// <returns></returns>
-    internal static ulong SteamId2Steam32(ulong steamId) => steamId - 0x110000100000000;
+    internal static ulong SteamId2Steam32(ulong steamId)
+    {
+        return IsSteam32ID(steamId) ? steamId : steamId - 0x110000100000000;
+    }
 
     /// <summary>
     /// 转换SteamId
     /// </summary>
     /// <param name="steamId"></param>
     /// <returns></returns>
-    internal static ulong Steam322SteamId(ulong steamId) => steamId + 0x110000100000000;
+    internal static ulong Steam322SteamId(ulong steamId)
+    {
+        return IsSteam32ID(steamId) ? steamId + 0x110000100000000 : steamId;
+    }
 
-    internal static bool IsSteam32ID(ulong id) => id <= 0xFFFFFFFF;
+    internal static bool IsSteam32ID(ulong id)
+    {
+        return id <= 0xFFFFFFFF;
+    }
 
     /// <summary>
     /// 匹配Steam商店Id