summaryrefslogtreecommitdiffstats
path: root/EssentialsUpdate/src
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2012-06-27 13:56:27 +0200
committersnowleo <schneeleo@gmail.com>2012-06-27 14:06:49 +0200
commitd88211bdf6017f0e52dc78d5ad7b356b42ac940c (patch)
treeb619728fd24a6488e31e5c097085350dd4ddcc86 /EssentialsUpdate/src
parent6123f17ef45136089837ba891c34be2ace5fd012 (diff)
downloadEssentials-d88211bdf6017f0e52dc78d5ad7b356b42ac940c.tar
Essentials-d88211bdf6017f0e52dc78d5ad7b356b42ac940c.tar.gz
Essentials-d88211bdf6017f0e52dc78d5ad7b356b42ac940c.tar.lz
Essentials-d88211bdf6017f0e52dc78d5ad7b356b42ac940c.tar.xz
Essentials-d88211bdf6017f0e52dc78d5ad7b356b42ac940c.zip
Fix EssentialsUpdate
Diffstat (limited to 'EssentialsUpdate/src')
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/UpdateCheck.java2
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/UpdateProcess.java2
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java2
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/chat/UsernameUtil.java2
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");