mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-02-12 04:20:41 +00:00
Fix compatibility issues with Citizens
This commit is contained in:
parent
a60f040f7e
commit
12e3eb1a23
3 changed files with 1 additions and 10 deletions
|
@ -564,7 +564,7 @@ public class Essentials extends JavaPlugin implements IEssentials
|
|||
}
|
||||
catch (NullPointerException ex)
|
||||
{
|
||||
return null;
|
||||
return new User(base, this);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue