From 61a1f5879a81994c2d1ab37eac6f71264be7e5f0 Mon Sep 17 00:00:00 2001
From: kuroppoi <68156848+kuroppoi@users.noreply.github.com>
Date: Sat, 6 Aug 2022 23:14:56 +0200
Subject: [PATCH] Filter item parent configs out first

---
 .../gameserver/GameConfiguration.java         | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gameserver/src/main/java/brainwine/gameserver/GameConfiguration.java b/gameserver/src/main/java/brainwine/gameserver/GameConfiguration.java
index aac8238..f5fb9e2 100644
--- a/gameserver/src/main/java/brainwine/gameserver/GameConfiguration.java
+++ b/gameserver/src/main/java/brainwine/gameserver/GameConfiguration.java
@@ -103,6 +103,12 @@ public class GameConfiguration {
             List<String> ignoredItems = new ArrayList<>();
             items.forEach((name, v) -> {
                 Map<String, Object> config = (Map<String, Object>)v;
+                
+                if(!config.containsKey("code")) {
+                    ignoredItems.add(name);
+                    return;
+                }
+                
                 String[] segments = name.split("/", 2);
                 String category = segments.length == 2 ? segments[0] : "unknown";
                 config.put("id", name);
@@ -142,16 +148,12 @@ public class GameConfiguration {
                 }
                 
                 // Register item
-                if(config.containsKey("code")) {
-                    try {
-                        Item item = JsonHelper.readValue(config, Item.class, new InjectableValues.Std().addValue("name", name));
-                        ItemRegistry.registerItem(item);
-                    } catch (JsonProcessingException e) {
-                        logger.fatal("Failed to register item {}", name, e);
-                        System.exit(0);
-                    }
-                } else {
-                    ignoredItems.add(name);
+                try {
+                    Item item = JsonHelper.readValue(config, Item.class, new InjectableValues.Std().addValue("name", name));
+                    ItemRegistry.registerItem(item);
+                } catch (JsonProcessingException e) {
+                    logger.fatal("Failed to register item {}", name, e);
+                    System.exit(0);
                 }
             });