diff --git a/pom.xml b/pom.xml
index afdd81e..9fb0437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
me.lokka30
PhantomWorlds
- 2.0.9
+ 2.0.10
PhantomWorlds
The Robust World Manager for Minecraft Servers
diff --git a/src/main/java/me/lokka30/phantomworlds/PhantomWorlds.java b/src/main/java/me/lokka30/phantomworlds/PhantomWorlds.java
index 3f5f27d..eef2f69 100644
--- a/src/main/java/me/lokka30/phantomworlds/PhantomWorlds.java
+++ b/src/main/java/me/lokka30/phantomworlds/PhantomWorlds.java
@@ -22,6 +22,7 @@
import me.lokka30.phantomworlds.listeners.player.PlayerJoinListener;
import me.lokka30.phantomworlds.listeners.player.PlayerPortalListener;
import me.lokka30.phantomworlds.listeners.player.PlayerTeleportListener;
+import me.lokka30.phantomworlds.listeners.plugin.PluginEnableListener;
import me.lokka30.phantomworlds.listeners.world.WorldInitListener;
import me.lokka30.phantomworlds.managers.FileManager;
import me.lokka30.phantomworlds.managers.WorldManager;
@@ -130,10 +131,11 @@ public void onEnable() {
instance = this;
+ getLogger().info("Starting up Placeholder Registration...");
if(Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
new PAPIHook().register();
} else {
-
+ getServer().getPluginManager().registerEvents(new PluginEnableListener(), this);
}
createTabs.addAll(generateCreateSuggestions());
diff --git a/src/main/java/me/lokka30/phantomworlds/managers/WorldManager.java b/src/main/java/me/lokka30/phantomworlds/managers/WorldManager.java
index f78dc8d..33858db 100644
--- a/src/main/java/me/lokka30/phantomworlds/managers/WorldManager.java
+++ b/src/main/java/me/lokka30/phantomworlds/managers/WorldManager.java
@@ -91,7 +91,7 @@ public void loadManagedWorlds() {
public WorldLoadResponse loadWorld(final String worldName) {
if(Bukkit.getWorld(worldName) != null) {
- return WorldLoadResponse.NOT_FOUND;
+ return WorldLoadResponse.ALREADY_LOADED;
}
final File worldFolder = new File(Bukkit.getWorldContainer(), worldName);
diff --git a/src/main/java/me/lokka30/phantomworlds/misc/PAPIHook.java b/src/main/java/me/lokka30/phantomworlds/misc/PAPIHook.java
index f645483..f0a5717 100644
--- a/src/main/java/me/lokka30/phantomworlds/misc/PAPIHook.java
+++ b/src/main/java/me/lokka30/phantomworlds/misc/PAPIHook.java
@@ -31,7 +31,7 @@
public class PAPIHook extends PlaceholderExpansion {
@Override
public @NotNull String getIdentifier() {
- return "pw";
+ return "pworlds";
}
@Override
diff --git a/src/main/java/me/lokka30/phantomworlds/misc/WorldLoadResponse.java b/src/main/java/me/lokka30/phantomworlds/misc/WorldLoadResponse.java
index a5a9954..b7096b8 100644
--- a/src/main/java/me/lokka30/phantomworlds/misc/WorldLoadResponse.java
+++ b/src/main/java/me/lokka30/phantomworlds/misc/WorldLoadResponse.java
@@ -24,9 +24,29 @@
* @since 2.0.5.0
*/
public enum WorldLoadResponse {
+
+ /**
+ * Success: World load response.
+ */
LOADED,
+
+ /**
+ * Failure: World not found.
+ */
NOT_FOUND,
+
+ /**
+ * Failure: Already loaded.
+ */
ALREADY_LOADED,
+
+ /**
+ * Failure: Invalid world.
+ */
INVALID,
+
+ /**
+ * Failure: Marked as skipped in data.yml
+ */
CONFIG_SKIPPED
}
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index d9f4208..a7c7c3e 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -5,7 +5,7 @@
# / / | `.__/| / | \__/ `._.' / ' / |,' \,' `._.' / /\__ `___,' \___.'
name: 'PhantomWorlds'
-version: '2.09'
+version: '2.0.10'
description: 'The Robust World Manager for Minecraft Servers'
authors: [ 'creatorfromhell', 'lokka30' ]
website: 'https://github.com/lokka30/PhantomWorlds'
@@ -14,6 +14,9 @@ main: 'me.lokka30.phantomworlds.PhantomWorlds'
api-version: '1.13'
load: STARTUP
+softdepend:
+ - PlaceholderAPI
+
permissions:
phantomworlds.*:
default: op