Fix difficulty defaulting to null.

TheNewEconomy · Dec 3, 2023 · 8d03e69 · 8d03e69
1 parent 1e8e6f4
commit 8d03e69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...a30/phantomworlds/commands/phantomworlds/parameters/suggestion/WorldFolderSuggestion.java b/...a30/phantomworlds/commands/phantomworlds/parameters/suggestion/WorldFolderSuggestion.java
@@ -43,7 +43,8 @@ public class WorldFolderSuggestion implements SuggestionProvider {
     final File directory = Bukkit.getWorldContainer();
 
     for(File file : directory.listFiles()) {
-      if(file.isDirectory()) {
+      final File levelDat = new File(file, "level.dat");
+      if(file.isDirectory() && levelDat.exists()) {
         folders.add(file.getName());
       }
     }

diff --git a/src/main/java/me/lokka30/phantomworlds/managers/WorldManager.java b/src/main/java/me/lokka30/phantomworlds/managers/WorldManager.java
@@ -122,7 +122,7 @@ public PhantomWorld getPhantomWorldFromData(final String name) {
             PhantomWorlds.instance().data.getConfig().getBoolean(cfgPath + "spawnAnimals", true),
             PhantomWorlds.instance().data.getConfig().getBoolean(cfgPath + "keepSpawnInMemory", false),
             PhantomWorlds.instance().data.getConfig().getBoolean(cfgPath + "allowPvP", true),
-            Difficulty.valueOf(PhantomWorlds.instance().data.getConfig().getString(cfgPath + "difficulty", null)),
+            Difficulty.valueOf(PhantomWorlds.instance().data.getConfig().getString(cfgPath + "difficulty", "NORMAL")),
             GameMode.valueOf(PhantomWorlds.instance().data.getConfig().getString(cfgPath + "gameMode", "SURVIVAL"))
     );