diff options
author | snowleo <schneeleo@gmail.com> | 2011-08-28 23:51:10 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-08-28 23:51:10 +0200 |
commit | b1bb8c48fc855b0267316e1795bb5dfca43c102c (patch) | |
tree | c909732908a941aea86073eb294d126652aa4c18 | |
parent | 566c2a620e8f204471d705735964728b0779dbc9 (diff) | |
download | Essentials-b1bb8c48fc855b0267316e1795bb5dfca43c102c.tar Essentials-b1bb8c48fc855b0267316e1795bb5dfca43c102c.tar.gz Essentials-b1bb8c48fc855b0267316e1795bb5dfca43c102c.tar.lz Essentials-b1bb8c48fc855b0267316e1795bb5dfca43c102c.tar.xz Essentials-b1bb8c48fc855b0267316e1795bb5dfca43c102c.zip |
Fix compatibility issues with Citizens
3 files changed, 1 insertions, 10 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index cc465d7bf..43d397fda 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -564,7 +564,7 @@ public class Essentials extends JavaPlugin implements IEssentials } catch (NullPointerException ex) { - return null; + return new User(base, this); } } diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java index 2e3920eba..c48f9f987 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java @@ -47,11 +47,6 @@ public class EssentialsConf extends Configuration LOGGER.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString())); } } - if (configFile.exists() && configFile.length() == 0 && !configFile.delete()) - { - LOGGER.log(Level.SEVERE, "Could not delete file " + configFile.toString()); - } - // This will delete files where the first character is 0. In most cases they are broken. if (configFile.exists() && configFile.length() != 0) { diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index fbd6995c5..66de8ef29 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -315,10 +315,6 @@ public class EssentialsPlayerListener extends PlayerListener return; } User user = ess.getUser(event.getPlayer()); - if (user == null) - { - user = new User(event.getPlayer(), ess); - } user.setNPC(false); final long currentTime = System.currentTimeMillis(); |