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

@ -156,6 +156,51 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
return expiryUnix > 0;
}
public String getUsername()
{
return this.username;
}
public void setUsername(final String username)
{
this.username = username;
}
public List<String> getIps()
{
return this.ips;
}
public String getBy()
{
return this.by;
}
public void setBy(final String by)
{
this.by = by;
}
public String getReason()
{
return this.reason;
}
public void setReason(final String reason)
{
this.reason = reason;
}
public long getExpiryUnix()
{
return this.expiryUnix;
}
public void setExpiryUnix(final long expiryUnix)
{
this.expiryUnix = expiryUnix;
}
public Date getExpiryDate()
{
return FUtil.getUnixDate(expiryUnix);

View File

@ -30,6 +30,8 @@ public class BanManager extends FreedomService
private final Map<String, Ban> ipBans = Maps.newHashMap();
private final Map<String, Ban> nameBans = Maps.newHashMap();
private final List<String> unbannableUsernames = Lists.newArrayList();
public static final String CONFIG_FILENAME = "bans.yml";
//
private final YamlConfig config;

View File

@ -87,4 +87,13 @@ public class PermbanList extends FreedomService
}
public Set<String> getPermbannedNames()
{
return this.permbannedNames;
}
public Set<String> getPermbannedIps()
{
return this.permbannedIps;
}
}