minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-03 21:28:00 +02:00
Code Issues Releases Wiki Activity

Fix compatibility issues with Citizens

Browse Source
This commit is contained in:
snowleo
2011-08-28 23:51:10 +02:00
parent 566c2a620e
commit b1bb8c48fc
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@@ -564,7 +564,7 @@ public class Essentials extends JavaPlugin implements IEssentials
} }
catch (NullPointerException ex) catch (NullPointerException ex)
{ {
return null; return new User(base, this);
} }
} }

5
Essentials/src/com/earth2me/essentials/EssentialsConf.java
View File

@@ -47,11 +47,6 @@ public class EssentialsConf extends Configuration
LOGGER.log(Level.SEVERE, Util.format("failedToCreateConfig", configFile.toString())); 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. // This will delete files where the first character is 0. In most cases they are broken.
if (configFile.exists() && configFile.length() != 0) if (configFile.exists() && configFile.length() != 0)
{ {

4
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@@ -315,10 +315,6 @@ public class EssentialsPlayerListener extends PlayerListener
return; return;
} }
User user = ess.getUser(event.getPlayer()); User user = ess.getUser(event.getPlayer());
if (user == null)
{
user = new User(event.getPlayer(), ess);
}
user.setNPC(false); user.setNPC(false);
final long currentTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();