project: Merge upstream

This commit is contained in:
Owain van Brakel
2020-02-26 07:11:47 +01:00
6 changed files with 131 additions and 45 deletions

View File

@@ -26,6 +26,7 @@ package net.runelite.http.api.item;
import lombok.AllArgsConstructor;
import lombok.Builder;
import com.google.gson.annotations.SerializedName;
import lombok.Value;
@Value
@@ -36,6 +37,8 @@ public class ItemStats
private boolean quest;
private boolean equipable;
private double weight;
@SerializedName("ge_limit")
private int geLimit;
private ItemEquipmentStats equipment;
@@ -80,7 +83,7 @@ public class ItemStats
newEquipment = equipment;
}
return new ItemStats(quest, equipable, newWeight, newEquipment);
return new ItemStats(quest, equipable, newWeight, 0, newEquipment);
}
}

View File

@@ -81,7 +81,7 @@ public class TypeAdapters
}
in.endObject();
return new ItemStats(quest, equip, weight, stats);
return new ItemStats(quest, equip, weight, 0, stats);
}
};