TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-27 08:59:45 +00:00
Code Issues Projects Releases Wiki Activity

Try to use consistent UUIDs and not rely on Bukkit lookup while saving.

Browse source
This commit is contained in:
KHobbits 2014-06-07 15:45:57 +01:00
parent 9d9af25c7f
commit 7e9328bd25
4 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/EssentialsUserConf.java
View file

@ -12,8 +12,8 @@ import org.bukkit.Bukkit;
public class EssentialsUserConf extends EssentialsConf public class EssentialsUserConf extends EssentialsConf
{ {
final String username; public final String username;
final UUID uuid; public final UUID uuid;
public EssentialsUserConf(final String username, final UUID uuid, final File configFile) public EssentialsUserConf(final String username, final UUID uuid, final File configFile)
{ {

2
Essentials/src/com/earth2me/essentials/User.java
View file

@ -240,7 +240,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
{ {
if (!base.isOnline()) if (!base.isOnline())
{ {
this.base = new OfflinePlayer(base.getUniqueId(), ess.getServer()); this.base = new OfflinePlayer(getConfigUUID(), ess.getServer());
} }
cleanup(); cleanup();
} }

12
Essentials/src/com/earth2me/essentials/UserData.java
View file

@ -50,7 +50,10 @@ public abstract class UserData extends PlayerExtension implements IConf
{ {
config.forceSave(); config.forceSave();
config.getFile().delete(); config.getFile().delete();
ess.getUserMap().removeUser(this.getBase().getName()); if (config.username != null)
{
ess.getUserMap().removeUser(config.username);
}
} }
public final void cleanup() public final void cleanup()
@ -838,7 +841,7 @@ public abstract class UserData extends PlayerExtension implements IConf
this.lastAccountName = lastAccountName; this.lastAccountName = lastAccountName;
config.setProperty("lastAccountName", lastAccountName); config.setProperty("lastAccountName", lastAccountName);
config.save(); config.save();
ess.getUserMap().trackUUID(base.getUniqueId(), lastAccountName); ess.getUserMap().trackUUID(getConfigUUID(), lastAccountName);
} }
public void setNPC(boolean set) public void setNPC(boolean set)
@ -968,6 +971,11 @@ public abstract class UserData extends PlayerExtension implements IConf
return new HashMap<String, Object>(); return new HashMap<String, Object>();
} }
public UUID getConfigUUID()
{
return config.uuid;
}
public void save() public void save()
{ {
config.save(); config.save();

5
Essentials/src/com/earth2me/essentials/UserMap.java
View file

@ -183,6 +183,11 @@ public class UserMap extends CacheLoader<String, User> implements IConf
public void removeUser(final String name) public void removeUser(final String name)
{ {
if (names == null)
{
ess.getLogger().warning("Name collection is null, cannot remove user.");
return;
}
UUID uuid = names.get(name); UUID uuid = names.get(name);
if (uuid != null) if (uuid != null)
{ {