Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove smart ban

Browse Source
This commit is contained in:
destro174 2022-02-19 20:14:19 +01:00
parent f4c6dcbf19
commit 8a5369d888
2 changed files with 0 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

@ -204,8 +204,6 @@ public class GriefPrevention extends JavaPlugin
public boolean config_signNotifications; //whether sign content will broadcast to administrators in game
public ArrayList<String> config_eavesdrop_whisperCommands; //list of whisper commands to eavesdrop on
public boolean config_smartBan; //whether to ban accounts which very likely owned by a banned player
public boolean config_endermenMoveBlocks; //whether or not endermen may move blocks around
public boolean config_claims_ravagersBreakBlocks; //whether or not ravagers may break blocks in claims
public boolean config_silverfishBreakBlocks; //whether silverfish may break blocks
@ -631,7 +629,6 @@ public class GriefPrevention extends JavaPlugin
String whisperCommandsToMonitor = config.getString("GriefPrevention.WhisperCommands", "/tell;/pm;/r;/whisper;/msg");
whisperCommandsToMonitor = config.getString("GriefPrevention.Spam.WhisperSlashCommands", whisperCommandsToMonitor);
this.config_smartBan = config.getBoolean("GriefPrevention.SmartBan", true);
this.config_trollFilterEnabled = config.getBoolean("GriefPrevention.Mute New Players Using Banned Words", true);
this.config_ipLimit = config.getInt("GriefPrevention.MaxPlayersPerIpAddress", 3);
this.config_silenceBans = config.getBoolean("GriefPrevention.SilenceBans", true);
@ -805,7 +802,6 @@ public class GriefPrevention extends JavaPlugin
outConfig.set("GriefPrevention.AdminsGetWhispers", this.config_whisperNotifications);
outConfig.set("GriefPrevention.AdminsGetSignNotifications", this.config_signNotifications);
outConfig.set("GriefPrevention.SmartBan", this.config_smartBan);
outConfig.set("GriefPrevention.Mute New Players Using Banned Words", this.config_trollFilterEnabled);
outConfig.set("GriefPrevention.MaxPlayersPerIpAddress", this.config_ipLimit);
outConfig.set("GriefPrevention.SilenceBans", this.config_silenceBans);

65
src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -258,71 +258,6 @@ class PlayerEventHandler implements Listener
event.setJoinMessage(null);
}
//FEATURE: auto-ban accounts who use an IP address which was very recently used by another banned account
if (instance.config_smartBan && !player.hasPlayedBefore())
{
//search temporarily banned IP addresses for this one
for (int i = 0; i < this.tempBannedIps.size(); i++)
{
IpBanInfo info = this.tempBannedIps.get(i);
String address = info.address.toString();
//eliminate any expired entries
if (now > info.expirationTimestamp)
{
this.tempBannedIps.remove(i--);
}
//if we find a match
else if (address.equals(playerData.ipAddress.toString()))
{
//if the account associated with the IP ban has been pardoned, remove all ip bans for that ip and we're done
OfflinePlayer bannedPlayer = instance.getServer().getOfflinePlayer(info.bannedAccountName);
if (!bannedPlayer.isBanned())
{
for (int j = 0; j < this.tempBannedIps.size(); j++)
{
IpBanInfo info2 = this.tempBannedIps.get(j);
if (info2.address.toString().equals(address))
{
OfflinePlayer bannedAccount = instance.getServer().getOfflinePlayer(info2.bannedAccountName);
instance.getServer().getBanList(BanList.Type.NAME).pardon(bannedAccount.getName());
this.tempBannedIps.remove(j--);
}
}
break;
}
//otherwise if that account is still banned, ban this account, too
else
{
GriefPrevention.AddLogEntry("Auto-banned new player " + player.getName() + " because that account is using an IP address very recently used by banned player " + info.bannedAccountName + " (" + info.address.toString() + ").", CustomLogEntryTypes.AdminActivity);
//notify any online ops
@SuppressWarnings("unchecked")
Collection<Player> players = (Collection<Player>) instance.getServer().getOnlinePlayers();
for (Player otherPlayer : players)
{
if (otherPlayer.isOp())
{
GriefPrevention.sendMessage(otherPlayer, TextMode.Success, Messages.AutoBanNotify, player.getName(), info.bannedAccountName);
}
}
//ban player
PlayerKickBanTask task = new PlayerKickBanTask(player, "", "GriefPrevention Smart Ban - Shared Login:" + info.bannedAccountName, true);
instance.getServer().getScheduler().scheduleSyncDelayedTask(instance, task, 10L);
//silence join message
event.setJoinMessage("");
break;
}
}
}
}
//in case player has changed his name, on successful login, update UUID > Name mapping
GriefPrevention.cacheUUIDNamePair(player.getUniqueId(), player.getName());