diff --git a/src/main/java/org/mvplugins/multiverse/core/world/WorldManager.java b/src/main/java/org/mvplugins/multiverse/core/world/WorldManager.java index a19db4ff5..a79198d30 100644 --- a/src/main/java/org/mvplugins/multiverse/core/world/WorldManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/WorldManager.java @@ -19,12 +19,12 @@ import io.vavr.control.Try; import jakarta.inject.Inject; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.WorldCreator; import org.bukkit.WorldType; import org.bukkit.plugin.PluginManager; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jvnet.hk2.annotations.Service; @@ -140,6 +140,7 @@ public final class WorldManager { * * @return The result of the load. */ + @ApiStatus.Internal public Try initAllWorlds() { return updateWorldsFromConfig().andThenTry(() -> { importExistingWorlds(); @@ -966,7 +967,7 @@ public boolean isUnloadedWorld(@Nullable String worldName) { * @return The multiverse world if it exists. */ public Option getLoadedWorld(@Nullable World world) { - return world == null ? Option.none() : Option.of((LoadedMultiverseWorld) loadedWorldsMap.get(world.getName())); + return world == null ? Option.none() : Option.of(loadedWorldsMap.get(world.getName())); } /** @@ -976,7 +977,7 @@ public Option getLoadedWorld(@Nullable World world) { * @return The multiverse world if it exists. */ public Option getLoadedWorld(@Nullable MultiverseWorld world) { - return world == null ? Option.none() : Option.of((LoadedMultiverseWorld) loadedWorldsMap.get(world.getName())); + return world == null ? Option.none() : Option.of(loadedWorldsMap.get(world.getName())); } /** @@ -986,7 +987,7 @@ public Option getLoadedWorld(@Nullable MultiverseWorld wo * @return The multiverse world if it exists. */ public Option getLoadedWorld(@Nullable String worldName) { - return Option.of((LoadedMultiverseWorld) loadedWorldsMap.get(worldName)); + return Option.of(loadedWorldsMap.get(worldName)); } /** @@ -1002,8 +1003,8 @@ public Option getLoadedWorldByNameOrAlias(@Nullable Strin private Option getLoadedWorldByAlias(@Nullable String alias) { return Option.ofOptional(loadedWorldsMap.values().stream() - .filter(world -> world.getColourlessAlias().equalsIgnoreCase(ChatColor.stripColor(alias))) - .map(world -> (LoadedMultiverseWorld) world) + .filter(world -> world.getColourlessAlias() + .equalsIgnoreCase(ChatTextFormatter.removeColor(alias))) .findFirst()); } @@ -1014,7 +1015,6 @@ private Option getLoadedWorldByAlias(@Nullable String ali */ public Collection getLoadedWorlds() { return loadedWorldsMap.values().stream() - .map(world -> (LoadedMultiverseWorld) world) .toList(); }