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

Fix regressions

Browse Source
This commit is contained in:
JustArchi
2016-06-30 09:33:22 +02:00
parent bd028ba459
commit 3b8315073b
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArchiSteamFarm/ArchiWebHandler.cs
View File

@@ -606,7 +606,7 @@ namespace ArchiSteamFarm {
type = description.Item2;
}
Steam.Item steamItem = new Steam.Item(appID, contextID, amount, realAppID, type);
Steam.Item steamItem = new Steam.Item(appID, contextID, classID, amount, realAppID, type);
tradeOffer.ItemsToGive.Add(steamItem);
}
@@ -644,7 +644,7 @@ namespace ArchiSteamFarm {
type = description.Item2;
}
Steam.Item steamItem = new Steam.Item(appID, contextID, amount, realAppID, type);
Steam.Item steamItem = new Steam.Item(appID, contextID, classID, amount, realAppID, type);
tradeOffer.ItemsToReceive.Add(steamItem);
}

31
ArchiSteamFarm/JSON/Steam.cs
View File

@@ -176,18 +176,30 @@ namespace ArchiSteamFarm.JSON {
internal uint RealAppID { get; set; }
internal EType Type { get; set; }
internal Item(uint appID, ulong contextID, ulong assetID, uint amount) {
if ((appID == 0) || (contextID == 0) || (assetID == 0) || (amount == 0)) {
throw new ArgumentNullException(nameof(appID) + " || " + nameof(contextID) + " || " + nameof(assetID) + " || " + nameof(amount));
// This constructor is used for constructing items in trades being sent
internal Item(uint appID, ulong contextID, ulong assetID, uint amount) : this(appID, contextID, amount) {
if (assetID == 0) {
throw new ArgumentNullException(nameof(assetID));
}
AppID = appID;
ContextID = contextID;
AssetID = assetID;
Amount = amount;
}
internal Item(uint appID, ulong contextID, uint amount, uint realAppID, EType type) {
// This constructor is used for constructing items in trades being received
internal Item(uint appID, ulong contextID, ulong classID, uint amount, uint realAppID, EType type) : this(appID, contextID, amount) {
if (classID == 0) {
throw new ArgumentNullException(nameof(classID));
}
ClassID = classID;
RealAppID = realAppID;
Type = type;
}
[SuppressMessage("ReSharper", "UnusedMember.Local")]
private Item() { }
private Item(uint appID, ulong contextID, uint amount) {
if ((appID == 0) || (contextID == 0) || (amount == 0)) {
throw new ArgumentNullException(nameof(appID) + " || " + nameof(contextID) + " || " + nameof(amount));
}
@@ -195,12 +207,7 @@ namespace ArchiSteamFarm.JSON {
AppID = appID;
ContextID = contextID;
Amount = amount;
RealAppID = realAppID;
Type = type;
}
[SuppressMessage("ReSharper", "UnusedMember.Local")]
private Item() { }
}
internal sealed class TradeOffer { // REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService#CEcon_TradeOffer