Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-27 11:37:38 +01:00
Code Issues Projects Releases Wiki Activity

Userdata cleanup

Browse Source
This commit is contained in:
KHobbits 2012-11-27 17:45:02 +00:00
parent c4f292f4ef
commit 889f60e58e
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,4 +42,6 @@ public interface IUser extends Player
Teleport getTeleport(); Teleport getTeleport();
void setJail(String jail); void setJail(String jail);
boolean isIgnoreExempt();
} }

6
Essentials/src/com/earth2me/essentials/User.java
View File

@ -737,4 +737,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
{ {
this.rightClickJump = rightClickJump; this.rightClickJump = rightClickJump;
} }
@Override
public boolean isIgnoreExempt()
{
return this.isAuthorized("essentials.chat.ignoreexempt");
}
} }

27
Essentials/src/com/earth2me/essentials/UserData.java
View File

@ -49,23 +49,23 @@ public abstract class UserData extends PlayerExtension implements IConf
lastHealTimestamp = _getLastHealTimestamp(); lastHealTimestamp = _getLastHealTimestamp();
jail = _getJail(); jail = _getJail();
mails = _getMails(); mails = _getMails();
teleportEnabled = getTeleportEnabled(); teleportEnabled = _getTeleportEnabled();
ignoredPlayers = getIgnoredPlayers();
godmode = _getGodModeEnabled(); godmode = _getGodModeEnabled();
muted = getMuted(); muted = _getMuted();
muteTimeout = _getMuteTimeout(); muteTimeout = _getMuteTimeout();
jailed = getJailed(); jailed = _getJailed();
jailTimeout = _getJailTimeout(); jailTimeout = _getJailTimeout();
lastLogin = _getLastLogin(); lastLogin = _getLastLogin();
lastLogout = _getLastLogout(); lastLogout = _getLastLogout();
lastLoginAddress = _getLastLoginAddress(); lastLoginAddress = _getLastLoginAddress();
afk = getAfk(); afk = _getAfk();
geolocation = _getGeoLocation(); geolocation = _getGeoLocation();
isSocialSpyEnabled = _isSocialSpyEnabled(); isSocialSpyEnabled = _isSocialSpyEnabled();
isNPC = _isNPC(); isNPC = _isNPC();
arePowerToolsEnabled = _arePowerToolsEnabled(); arePowerToolsEnabled = _arePowerToolsEnabled();
kitTimestamps = _getKitTimestamps(); kitTimestamps = _getKitTimestamps();
nickname = _getNickname(); nickname = _getNickname();
setIgnoredPlayers(_getIgnoredPlayers());
} }
private double money; private double money;
@ -415,7 +415,7 @@ public abstract class UserData extends PlayerExtension implements IConf
} }
private boolean teleportEnabled; private boolean teleportEnabled;
private boolean getTeleportEnabled() private boolean _getTeleportEnabled()
{ {
return config.getBoolean("teleportenabled", true); return config.getBoolean("teleportenabled", true);
} }
@ -447,7 +447,7 @@ public abstract class UserData extends PlayerExtension implements IConf
} }
private List<String> ignoredPlayers; private List<String> ignoredPlayers;
public List<String> getIgnoredPlayers() public List<String> _getIgnoredPlayers()
{ {
return Collections.synchronizedList(config.getStringList("ignore")); return Collections.synchronizedList(config.getStringList("ignore"));
} }
@ -480,7 +480,7 @@ public abstract class UserData extends PlayerExtension implements IConf
public boolean isIgnoredPlayer(IUser user) public boolean isIgnoredPlayer(IUser user)
{ {
return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isAuthorized("essentials.chat.ignoreexempt")); return (ignoredPlayers.contains(user.getName().toLowerCase(Locale.ENGLISH)) && !user.isIgnoreExempt());
} }
public void setIgnoredPlayer(IUser user, boolean set) public void setIgnoredPlayer(IUser user, boolean set)
@ -515,10 +515,15 @@ public abstract class UserData extends PlayerExtension implements IConf
} }
private boolean muted; private boolean muted;
public boolean getMuted() public boolean _getMuted()
{ {
return config.getBoolean("muted", false); return config.getBoolean("muted", false);
} }
public boolean getMuted()
{
return muted;
}
public boolean isMuted() public boolean isMuted()
{ {
@ -551,7 +556,7 @@ public abstract class UserData extends PlayerExtension implements IConf
} }
private boolean jailed; private boolean jailed;
private boolean getJailed() private boolean _getJailed()
{ {
return config.getBoolean("jailed", false); return config.getBoolean("jailed", false);
} }
@ -678,7 +683,7 @@ public abstract class UserData extends PlayerExtension implements IConf
} }
private boolean afk; private boolean afk;
private boolean getAfk() private boolean _getAfk()
{ {
return config.getBoolean("afk", false); return config.getBoolean("afk", false);
} }