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

Starting work on type.

Browse Source
This commit is contained in:
MagicBot
2024-02-19 01:58:27 -05:00
parent 11e6b793d5
commit 5b547611a5
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/ItemTemplate.java
+2 -6
View File
@@ -12,7 +12,6 @@ import engine.Enum;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.pmw.tinylog.Logger;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
@@ -79,11 +78,8 @@ public class ItemTemplate {
// Parsing an enum // Parsing an enum
try { // item_type = Enum.ItemType.valueOf((String) jsonObject.get("item_type"));
item_type = Enum.ItemType.valueOf((String) jsonObject.get("item_type"));
} catch (Exception e) {
Logger.error((String) jsonObject.get("item_type"));
}
item_eq_slots_value = ((Long) jsonObject.get("item_eq_slots_value")).intValue(); item_eq_slots_value = ((Long) jsonObject.get("item_eq_slots_value")).intValue();
item_eq_slots_type = (boolean) jsonObject.get("item_eq_slots_type"); item_eq_slots_type = (boolean) jsonObject.get("item_eq_slots_type");
src/engine/server/world/WorldServer.java
+3 -3
View File
@@ -339,12 +339,12 @@ public class WorldServer {
Logger.info("Initializing MeshBounds"); Logger.info("Initializing MeshBounds");
MeshBounds.InitializeBuildingBounds(); MeshBounds.InitializeBuildingBounds();
Logger.info("Loading ItemBases");
ItemBase.loadAllItemBases();
Logger.info("Loading Item Templates"); Logger.info("Loading Item Templates");
DbManager.ItemQueries.LOAD_ITEM_TEMPLATES(); DbManager.ItemQueries.LOAD_ITEM_TEMPLATES();
Logger.info("Loading ItemBases");
ItemBase.loadAllItemBases();
Logger.info("Loading PromotionClasses"); Logger.info("Loading PromotionClasses");
DbManager.PromotionQueries.GET_ALL_PROMOTIONS(); DbManager.PromotionQueries.GET_ALL_PROMOTIONS();