Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

New branch more progress

Browse Source
This commit is contained in:
MagicBot
2024-02-26 21:09:57 -05:00
parent 2ffd354f38
commit 8656d6bfb9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/ItemTemplate.java
+4
View File
@@ -156,6 +156,8 @@ public class ItemTemplate {
item_defense_rating = ((Long) jsonObject.get("item_defense_rating")).intValue(); item_defense_rating = ((Long) jsonObject.get("item_defense_rating")).intValue();
} }
// Fields only present for WEAPON
if (item_type.equals(Enum.ItemType.WEAPON)) { if (item_type.equals(Enum.ItemType.WEAPON)) {
JSONObject item_weapon = (JSONObject) jsonObject.get("item_weapon"); JSONObject item_weapon = (JSONObject) jsonObject.get("item_weapon");
@@ -167,6 +169,8 @@ public class ItemTemplate {
JSONArray weapon_damage = (JSONArray) item_weapon.get("weapon_damage"); JSONArray weapon_damage = (JSONArray) item_weapon.get("weapon_damage");
// Need a pojo for this or a PAIR<>
for (Object o : weapon_damage) { for (Object o : weapon_damage) {
JSONObject damage_entry = (JSONObject) o; JSONObject damage_entry = (JSONObject) o;
item_weapon_damage_type = Enum.SourceType.valueOf(((String) damage_entry.get("damage_type")).toUpperCase()); item_weapon_damage_type = Enum.SourceType.valueOf(((String) damage_entry.get("damage_type")).toUpperCase());