Skip to content

Commit 81a9a6f

Browse files
committed
Merge branch 'issue_two' into development
2 parents 9fde6af + ed3c4f2 commit 81a9a6f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

impl/yaml/src/main/java/de/derfrzocker/custom/ore/generator/impl/WorldConfigYamlImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ public WorldConfigYamlImpl(@NotNull final String name) {
6161
}
6262

6363
public static WorldConfigYamlImpl deserialize(@NotNull final Map<String, Object> map) {
64-
final CustomOreGeneratorService service = Bukkit.getServicesManager().load(CustomOreGeneratorService.class);
65-
Validate.notNull(service, "CustomOreGeneratorService can not be null");
66-
6764
if (map.containsKey(NAME_KEY)) { //newest format
6865
final WorldConfigYamlImpl worldConfig = new WorldConfigYamlImpl((String) map.get(NAME_KEY));
6966
final Object oreConfigs = map.get(ORE_CONFIG_KEY);
@@ -75,6 +72,9 @@ public static WorldConfigYamlImpl deserialize(@NotNull final Map<String, Object>
7572
}
7673

7774
final WorldConfigYamlImpl worldConfig = new WorldConfigYamlImpl((String) map.get(WORLD_KEY));
75+
final CustomOreGeneratorService service = Bukkit.getServicesManager().load(CustomOreGeneratorService.class);
76+
77+
Validate.notNull(service, "CustomOreGeneratorService can not be null");
7878

7979
if (!map.containsKey(ORE_CONFIG_KEY)) {
8080
// old format version

0 commit comments

Comments
 (0)