From 2a097530e5ea96e1329dca19b049a23ccce5d3ba Mon Sep 17 00:00:00 2001 From: Iaccidentally Date: Mon, 14 Jan 2013 20:06:28 -0500 Subject: Revert "Remove Transient :: Formatting Cleanup" --- .../src/com/earth2me/essentials/UserData.java | 33 +++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'Essentials2Compat/src/com/earth2me/essentials/UserData.java') diff --git a/Essentials2Compat/src/com/earth2me/essentials/UserData.java b/Essentials2Compat/src/com/earth2me/essentials/UserData.java index 2dc8d2cec..fdd16c495 100644 --- a/Essentials2Compat/src/com/earth2me/essentials/UserData.java +++ b/Essentials2Compat/src/com/earth2me/essentials/UserData.java @@ -12,10 +12,11 @@ import org.bukkit.inventory.ItemStack; public class UserData { - protected final IEssentials ess; + protected final transient IEssentials ess; private EssentialsConf config; private final File folder; + protected UserData(IEssentials ess, File file) { this.ess = ess; @@ -58,6 +59,7 @@ public class UserData kitTimestamps = _getKitTimestamps(); nickname = _getNickname(); } + private double money; private double _getMoney() @@ -89,6 +91,7 @@ public class UserData config.setProperty("money", value); config.save(); } + private Map homes; private Map _getHomes() @@ -121,6 +124,7 @@ public class UserData return config.getLocation("homes." + search, ess.getServer()); } + public List getHomes() { return new ArrayList(homes.keySet()); @@ -162,6 +166,7 @@ public class UserData } return false; } + private String nickname; public String _getNickname() @@ -180,6 +185,7 @@ public class UserData config.setProperty("nickname", nick); config.save(); } + private List unlimited; private List _getUnlimited() @@ -210,6 +216,7 @@ public class UserData config.setProperty("unlimited", unlimited); config.save(); } + private Map powertools; private Map _getPowertools() @@ -263,6 +270,7 @@ public class UserData { return !powertools.isEmpty(); } + private StoredLocation lastLocation; private StoredLocation _getLastLocation() @@ -281,6 +289,8 @@ public class UserData { return lastLocation; } + + private long lastTeleportTimestamp; private long _getLastTeleportTimestamp() @@ -299,6 +309,7 @@ public class UserData config.setProperty("timestamps.lastteleport", time); config.save(); } + private long lastHealTimestamp; private long _getLastHealTimestamp() @@ -317,6 +328,7 @@ public class UserData config.setProperty("timestamps.lastheal", time); config.save(); } + private String jail; private String _getJail() @@ -343,6 +355,7 @@ public class UserData } config.save(); } + private List mails; private List _getMails() @@ -375,6 +388,7 @@ public class UserData mails.add(mail); setMails(mails); } + private boolean teleportEnabled; private boolean getTeleportEnabled() @@ -407,6 +421,7 @@ public class UserData setSocialSpyEnabled(ret); return ret; } + private List ignoredPlayers; public List getIgnoredPlayers() @@ -428,6 +443,8 @@ public class UserData } config.save(); } + + private boolean godmode; private boolean _getGodModeEnabled() @@ -446,6 +463,7 @@ public class UserData config.setProperty("godmode", set); config.save(); } + private boolean muted; public boolean getMuted() @@ -464,6 +482,7 @@ public class UserData config.setProperty("muted", set); config.save(); } + private long muteTimeout; private long _getMuteTimeout() @@ -482,6 +501,7 @@ public class UserData config.setProperty("timestamps.mute", time); config.save(); } + private boolean jailed; private boolean getJailed() @@ -507,6 +527,7 @@ public class UserData setJailed(ret); return ret; } + private long jailTimeout; private long _getJailTimeout() @@ -547,6 +568,7 @@ public class UserData config.setProperty("ban.timeout", time); config.save(); } + private long lastLogin; private long _getLastLogin() @@ -564,6 +586,8 @@ public class UserData lastLogin = time; config.setProperty("timestamps.login", time); } + + private long lastLogout; private long _getLastLogout() @@ -582,6 +606,7 @@ public class UserData config.setProperty("timestamps.logout", time); config.save(); } + private String lastLoginAddress; private String _getLastLoginAddress() @@ -599,6 +624,7 @@ public class UserData lastLoginAddress = address; config.setProperty("ipAddress", address); } + private boolean afk; private boolean getAfk() @@ -624,6 +650,7 @@ public class UserData setAfk(ret); return ret; } + private boolean newplayer; //TODO: unused variable? private String geolocation; @@ -651,6 +678,7 @@ public class UserData } config.save(); } + private boolean isSocialSpyEnabled; private boolean _isSocialSpyEnabled() @@ -669,6 +697,7 @@ public class UserData config.setProperty("socialspy", status); config.save(); } + private boolean isNPC; private boolean _isNPC() @@ -687,6 +716,7 @@ public class UserData config.setProperty("npc", set); config.save(); } + private boolean arePowerToolsEnabled; public boolean arePowerToolsEnabled() @@ -712,6 +742,7 @@ public class UserData { return config.getBoolean("powertoolsenabled", true); } + private ConfigurationSection kitTimestamps; private ConfigurationSection _getKitTimestamps() -- cgit v1.2.3