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

Merge remote-tracking branch 'origin/feature-json6' into feature-json6

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-03-10 14:33:31 -05:00
parent e1018a48f0 50d75eecc6
commit f3d4a2becc
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+1 -1
View File
@@ -312,7 +312,7 @@ public enum CombatManager {
//get Weapon //get Weapon
boolean isWeapon = true; boolean isWeapon = true;
Item weapon = equipped.get(slot); Item weapon = equipped.get(weaponSlot);
ItemBase wb = null; ItemBase wb = null;
if (weapon == null) if (weapon == null)
src/engine/objects/ItemTemplate.java
+7 -3
View File
@@ -166,8 +166,10 @@ public class ItemTemplate {
Object skill_used = jsonObject.get("item_skill_used"); Object skill_used = jsonObject.get("item_skill_used");
if (skill_used instanceof String) if (skill_used instanceof String) {
item_skill_used = (String) skill_used; if (skill_used.equals("Cloth") == false)
item_skill_used = (String) skill_used;
}
Object mastery_used = jsonObject.get("item_skill_mastery_used"); Object mastery_used = jsonObject.get("item_skill_mastery_used");
@@ -265,7 +267,9 @@ public class ItemTemplate {
JSONObject skill_req = (JSONObject) o; JSONObject skill_req = (JSONObject) o;
String skill_type = (String) skill_req.get("skill_type"); String skill_type = (String) skill_req.get("skill_type");
int skill_level = ((Long) skill_req.get("skill_level")).intValue(); int skill_level = ((Long) skill_req.get("skill_level")).intValue();
item_skill_required.put(skill_type, skill_level);
if (skill_type.equals("Cloth") == false)
item_skill_required.put(skill_type, skill_level);
} }
JSONObject race_required = (JSONObject) jsonObject.get("item_race_req"); JSONObject race_required = (JSONObject) jsonObject.get("item_race_req");