1. Remove marco from dev
2. Add namehistory
3. Fix grammar issues
4. Actually use CoreProtect bridge to rollback players
5.  Improve automatic wiper
This commit is contained in:
Lemon
2017-10-13 23:35:11 +05:00
committed by GitHub
parent 3c09bc7995
commit ed2f15cc54
38 changed files with 1562 additions and 461 deletions

View File

@ -12,6 +12,7 @@ import me.totalfreedom.totalfreedommod.util.FUtil;
import net.pravian.aero.base.ConfigLoadable;
import net.pravian.aero.base.ConfigSavable;
import net.pravian.aero.base.Validatable;
import net.pravian.aero.config.YamlConfig;
import net.pravian.aero.util.Ips;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
@ -40,6 +41,8 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
@Setter
private String loginMessage = null;
public static final String CONFIG_FILENAME = "admins.yml";
public Admin(Player player)
{
this.configKey = player.getName().toLowerCase();
@ -126,6 +129,11 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
}
}
public String getLoginMessage()
{
return this.loginMessage;
}
public void removeIp(String ip)
{
if (ips.contains(ip))
@ -168,4 +176,54 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
&& !ips.isEmpty()
&& lastLogin != null;
}
public boolean isActive()
{
return this.active;
}
public String getConfigKey()
{
return this.configKey;
}
public String getName()
{
return this.name;
}
public void setName(final String name)
{
this.name = name;
}
public Rank getRank()
{
return this.rank;
}
public void setRank(final Rank rank)
{
this.rank = rank;
}
public List<String> getIps()
{
return this.ips;
}
public Date getLastLogin()
{
return this.lastLogin;
}
public void setLastLogin(final Date lastLogin)
{
this.lastLogin = lastLogin;
}
public void setLoginMessage(final String loginMessage)
{
this.loginMessage = loginMessage;
}
}

View File

@ -130,6 +130,16 @@ public class AdminList extends FreedomService
return admin != null && admin.isActive();
}
public Map<String, Admin> getAllAdmins()
{
return this.allAdmins;
}
public Set<Admin> getActiveAdmins()
{
return this.activeAdmins;
}
public boolean isSeniorAdmin(CommandSender sender)
{
Admin admin = getAdmin(sender);