Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 14:10:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Modify default logic of handling keys"

Browse Source 
This reverts commit 84271488e6.

http://steamcommunity.com/groups/ascfarm/discussions/1/352788552264319199
This commit is contained in:
JustArchi
2016-07-19 05:05:23 +02:00
parent 8cbda098de
commit 325529262a
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ArchiSteamFarm/Bot.cs
View File

@@ -927,8 +927,6 @@ namespace ArchiSteamFarm {
using (IEnumerator<Bot> iterator = Bots.Values.GetEnumerator()) {
string key = reader.ReadLine();
Bot currentBot = this;
bool startHandling = false;
while (!string.IsNullOrEmpty(key) && (currentBot != null)) {
if (validate && !IsValidCdKey(key)) {
key = reader.ReadLine(); // Next key
@@ -971,18 +969,8 @@ namespace ArchiSteamFarm {
break; // Next bot, without changing key
}
bool startInnerHandling = false;
bool alreadyInnerHandled = false;
foreach (Bot bot in Bots.Values) {
if (bot == this) {
startInnerHandling = true;
continue;
}
if (!startInnerHandling || !bot.SteamClient.IsConnected) {
continue;
}
bool alreadyHandled = false;
foreach (Bot bot in Bots.Values.Where(bot => (bot != this) && bot.SteamClient.IsConnected)) {
ArchiHandler.PurchaseResponseCallback otherResult = await bot.ArchiHandler.RedeemKey(key).ConfigureAwait(false);
if (otherResult == null) {
response.Append(Environment.NewLine + "<" + bot.BotName + "> Key: " + key + " | Status: Timeout!");
@@ -993,13 +981,13 @@ namespace ArchiSteamFarm {
case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.DuplicatedKey:
case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.InvalidKey:
case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.OK:
alreadyInnerHandled = true; // This key is already handled, as we either redeemed it or we're sure it's dupe/invalid
alreadyHandled = true; // This key is already handled, as we either redeemed it or we're sure it's dupe/invalid
break;
}
response.Append(Environment.NewLine + "<" + bot.BotName + "> Key: " + key + " | Status: " + otherResult.PurchaseResult + " | Items: " + string.Join("", otherResult.Items));
if (alreadyInnerHandled) {
if (alreadyHandled) {
break;
}
}
@@ -1016,10 +1004,7 @@ namespace ArchiSteamFarm {
do {
currentBot = iterator.MoveNext() ? iterator.Current : null;
if (currentBot == this) {
startHandling = true;
}
} while (!startHandling || (currentBot == this) || ((currentBot != null) && !currentBot.SteamClient.IsConnected));
} while ((currentBot == this) || ((currentBot != null) && !currentBot.SteamClient.IsConnected));
}
}