diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java b/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java index 3d0034166..1f69ebde1 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java +++ b/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java @@ -31,7 +31,7 @@ public class UpdateCheck private void checkForEssentials() { final PluginManager pluginManager = plugin.getServer().getPluginManager(); - final Plugin essentials = pluginManager.getPlugin("Essentials"); + final Plugin essentials = pluginManager.getPlugin("Essentials-3"); essentialsInstalled = essentials != null; if (essentialsInstalled) { diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java b/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java index 3da76cc25..3a8139840 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java +++ b/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java @@ -123,7 +123,7 @@ public class UpdateProcess implements Listener public void onPlayerJoin(final PlayerJoinEvent event) { final Player player = event.getPlayer(); - if (currentPlayer.getName().equals(player.getName())) + if (currentPlayer != null && currentPlayer.getName().equals(player.getName())) { currentPlayer = player; player.sendMessage("You quit the game, while the installation wizard was running."); diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java b/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java index 5eb3c8082..78563a950 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java +++ b/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java @@ -21,7 +21,7 @@ public class ConfigCommand extends AbstractFileCommand implements Command BufferedReader page = null; try { - page = getPluginConfig("Essentials", "config.yml"); + page = getPluginConfig("Essentials-3", "config.yml"); final StringBuilder input = new StringBuilder(); do { diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java b/EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java index 3df615652..2fd9a38b6 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java +++ b/EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java @@ -104,7 +104,7 @@ public final class UsernameUtil private static void addEssentialsVersion(final Server server, final StringBuilder nameBuilder) { - final Plugin essentials = server.getPluginManager().getPlugin("Essentials"); + final Plugin essentials = server.getPluginManager().getPlugin("Essentials-3"); if (essentials != null) { nameBuilder.append(" ESS"); |