MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Migration to org.json

Browse Source
This commit is contained in:
MagicBot
2024-04-22 09:21:46 -04:00
parent d557e30716
commit ba47b30673
6 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/ItemTemplate.java
+4 -4
View File
@@ -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);
src/engine/objects/Warehouse.java
+4 -4
View File
@@ -19,8 +19,8 @@ import engine.net.client.ClientConnection;
import engine.net.client.msg.*;
import engine.server.MBServerStatics;
import org.joda.time.DateTime;
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.sql.SQLException;
@@ -56,8 +56,8 @@ public class Warehouse {
JSONObject resources = (JSONObject) warehouse.get("resources");
for (Object key : resources.keySet()) {
mbEnums.ResourceType resourceType = mbEnums.ResourceType.valueOf((String) key);
for (String key : resources.keySet()) {
mbEnums.ResourceType resourceType = mbEnums.ResourceType.valueOf(key);
int value = ((Long) resources.get(key)).intValue();
this.resources.put(resourceType, value);
}