forked from MagicBane/Server
Migration to org.json
This commit is contained in:
@@ -10,8 +10,8 @@ package engine.objects;
|
||||
|
||||
import engine.math.Vector3fImmutable;
|
||||
import engine.mbEnums;
|
||||
import org.json.simple.JSONArray;
|
||||
import org.json.simple.JSONObject;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONObject;
|
||||
import org.pmw.tinylog.Logger;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -194,7 +194,7 @@ public class ItemTemplate {
|
||||
|
||||
JSONObject resist_json = (JSONObject) jsonObject.get("combat_attack_resist");
|
||||
|
||||
for (Object key : resist_json.keySet()) {
|
||||
for (String key : resist_json.keySet()) {
|
||||
float resist = ((Double) resist_json.get(key)).floatValue();
|
||||
combat_attack_resist.put((String) key, resist);
|
||||
}
|
||||
@@ -488,7 +488,7 @@ public class ItemTemplate {
|
||||
|
||||
JSONObject rune_speed_json = (JSONObject) jsonObject.get("rune_speed");
|
||||
|
||||
for (Object key : rune_speed_json.keySet()) {
|
||||
for (String key : rune_speed_json.keySet()) {
|
||||
mbEnums.MovementType movementType = mbEnums.MovementType.valueOf((String) key);
|
||||
float speed = ((Double) rune_speed_json.get(key)).floatValue();
|
||||
rune_speed.put(movementType, speed);
|
||||
|
||||
Reference in New Issue
Block a user