Mirrors/ArchiSteamFarm
2
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm synced 2024-09-20 06:22:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc

Browse source
This commit is contained in:
JustArchi 2019-01-11 02:50:36 +01:00
parent c439e6a29b
commit 6afafa4550
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ArchiSteamFarm/ArchiWebHandler.cs
View file

@ -1066,7 +1066,7 @@ namespace ArchiSteamFarm {
return null;
}
Dictionary<(uint AppID, uint ContextID, ulong ClassID), (uint RealAppID, Steam.Asset.EType Type)> descriptions = new Dictionary<(uint AppID, uint ContextID, ulong ClassID), (uint RealAppID, Steam.Asset.EType Type)>();
Dictionary<(uint AppID, ulong ClassID), (uint RealAppID, Steam.Asset.EType Type)> descriptions = new Dictionary<(uint AppID, ulong ClassID), (uint RealAppID, Steam.Asset.EType Type)>();
foreach (KeyValue description in response["descriptions"].Children) {
uint appID = description["appid"].AsUnsignedInteger();
@ -1077,14 +1077,6 @@ namespace ArchiSteamFarm {
return null;
}
uint contextID = description["contextid"].AsUnsignedInteger();
if (contextID == 0) {
Bot.ArchiLogger.LogNullError(nameof(contextID));
return null;
}
ulong classID = description["classid"].AsUnsignedLong();
if (classID == 0) {
@ -1093,7 +1085,7 @@ namespace ArchiSteamFarm {
return null;
}
if (descriptions.ContainsKey((appID, contextID, classID))) {
if (descriptions.ContainsKey((appID, classID))) {
continue;
}
@ -1114,7 +1106,7 @@ namespace ArchiSteamFarm {
}
}
descriptions[(appID, contextID, classID)] = (realAppID, type);
descriptions[(appID, classID)] = (realAppID, type);
}
HashSet<Steam.TradeOffer> result = new HashSet<Steam.TradeOffer>();
@ -2383,7 +2375,7 @@ namespace ArchiSteamFarm {
return uri.AbsolutePath.StartsWith("/login", StringComparison.Ordinal) || uri.Host.Equals("lostauth");
}
private static bool ParseItems(IReadOnlyDictionary<(uint AppID, uint ContextID, ulong ClassID), (uint RealAppID, Steam.Asset.EType Type)> descriptions, IReadOnlyCollection<KeyValue> input, ICollection<Steam.Asset> output) {
private static bool ParseItems(IReadOnlyDictionary<(uint AppID, ulong ClassID), (uint RealAppID, Steam.Asset.EType Type)> descriptions, IReadOnlyCollection<KeyValue> input, ICollection<Steam.Asset> output) {
if ((descriptions == null) || (input == null) || (input.Count == 0) || (output == null)) {
ASF.ArchiLogger.LogNullError(nameof(descriptions) + " || " + nameof(input) + " || " + nameof(output));
@ -2426,7 +2418,7 @@ namespace ArchiSteamFarm {
uint realAppID = 0;
Steam.Asset.EType type = Steam.Asset.EType.Unknown;
if (descriptions.TryGetValue((appID, contextID, classID), out (uint RealAppID, Steam.Asset.EType Type) description)) {
if (descriptions.TryGetValue((appID, classID), out (uint RealAppID, Steam.Asset.EType Type) description)) {
realAppID = description.RealAppID;
type = description.Type;
}

2
ArchiSteamFarm/Trading.cs
View file

@ -317,7 +317,7 @@ namespace ArchiSteamFarm {
uint amountToGive = itemToGive.Amount;
HashSet<Steam.Asset> itemsToRemove = new HashSet<Steam.Asset>();
// Keep in mind that ClassID is unique only within appID/contextID scope - we can do it like this because we're not dealing with non-Steam items here (otherwise we'd need to check appID and contextID too)
// Keep in mind that ClassID is unique only within appID scope - we can do it like this because we're not dealing with non-Steam items here (otherwise we'd need to check appID too)
foreach (Steam.Asset item in inventory.Where(item => item.ClassID == itemToGive.ClassID)) {
if (amountToGive >= item.Amount) {
itemsToRemove.Add(item);