array-in-a-matrix/brainwine
1
0
Fork 0
mirror of https://github.com/array-in-a-matrix/brainwine.git synced 2025-04-02 11:11:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Filter item parent configs out first

Browse source
This commit is contained in:
kuroppoi 2022-08-06 23:14:56 +02:00
parent 306a988e5c
commit 61a1f5879a
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gameserver/src/main/java/brainwine/gameserver/GameConfiguration.java
View file

@ -103,6 +103,12 @@ public class GameConfiguration {
List<String> ignoredItems = new ArrayList<>(); List<String> ignoredItems = new ArrayList<>();
items.forEach((name, v) -> { items.forEach((name, v) -> {
Map<String, Object> config = (Map<String, Object>)v; Map<String, Object> config = (Map<String, Object>)v;
if(!config.containsKey("code")) {
ignoredItems.add(name);
return;
}
String[] segments = name.split("/", 2); String[] segments = name.split("/", 2);
String category = segments.length == 2 ? segments[0] : "unknown"; String category = segments.length == 2 ? segments[0] : "unknown";
config.put("id", name); config.put("id", name);
@ -142,7 +148,6 @@ public class GameConfiguration {
} }
// Register item // Register item
if(config.containsKey("code")) {
try { try {
Item item = JsonHelper.readValue(config, Item.class, new InjectableValues.Std().addValue("name", name)); Item item = JsonHelper.readValue(config, Item.class, new InjectableValues.Std().addValue("name", name));
ItemRegistry.registerItem(item); ItemRegistry.registerItem(item);
@ -150,9 +155,6 @@ public class GameConfiguration {
logger.fatal("Failed to register item {}", name, e); logger.fatal("Failed to register item {}", name, e);
System.exit(0); System.exit(0);
} }
} else {
ignoredItems.add(name);
}
}); });
for(String item : ignoredItems) { for(String item : ignoredItems) {