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 7f3101b91..05c0228ea 100644 --- a/src/main/java/org/mvplugins/multiverse/core/world/WorldManager.java +++ b/src/main/java/org/mvplugins/multiverse/core/world/WorldManager.java @@ -1068,7 +1068,8 @@ public Option getWorld(@Nullable String worldName) { * @return The world if it exists. */ public Option getWorldByNameOrAlias(@Nullable String worldNameOrAlias) { - return getWorld(worldStore.translateAlias(worldNameOrAlias)); + return getWorld(worldNameOrAlias) + .orElse(() -> getWorld(worldStore.translateAlias(worldNameOrAlias))); } /** @@ -1116,7 +1117,8 @@ public Option getUnloadedWorld(@Nullable String worldName) { * @return The world if it exists. */ public Option getUnloadedWorldByNameOrAlias(@Nullable String worldNameOrAlias) { - return getUnloadedWorld(worldStore.translateAlias(worldNameOrAlias)); + return getUnloadedWorld(worldNameOrAlias) + .orElse(() -> getUnloadedWorld(worldStore.translateAlias(worldNameOrAlias))); } /** @@ -1177,7 +1179,8 @@ public Option getLoadedWorld(@Nullable String worldName) * @return The multiverse world if it exists. */ public Option getLoadedWorldByNameOrAlias(@Nullable String worldNameOrAlias) { - return getLoadedWorld(worldStore.translateAlias(worldNameOrAlias)); + return getLoadedWorld(worldNameOrAlias) + .orElse(() -> getLoadedWorld(worldStore.translateAlias(worldNameOrAlias))); } /**