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

Recalibrated the IP address sharing limit.

Browse Source 
Ignoring players with 'got wood' achievement, but reduced default limit
to 3.
This commit is contained in:
ryanhamshire 2015-04-26 13:12:33 -07:00
parent c6e7eb7144
commit 4a3c105294
3 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

@ -544,7 +544,7 @@ public class GriefPrevention extends JavaPlugin
String whisperCommandsToMonitor = config.getString("GriefPrevention.WhisperCommands", "/tell;/pm;/r;/w;/whisper;/t;/msg");
this.config_smartBan = config.getBoolean("GriefPrevention.SmartBan", true);
this.config_ipLimit = config.getInt("GriefPrevention.MaxPlayersPerIpAddress", 5);
this.config_ipLimit = config.getInt("GriefPrevention.MaxPlayersPerIpAddress", 3);
this.config_endermenMoveBlocks = config.getBoolean("GriefPrevention.EndermenMoveBlocks", false);
this.config_silverfishBreakBlocks = config.getBoolean("GriefPrevention.SilverfishBreakBlocks", false);

55
src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -312,7 +312,7 @@ class PlayerEventHandler implements Listener
GriefPrevention.AddLogEntry("Banning " + player.getName() + " for spam.", CustomLogEntryTypes.AdminActivity);
//kick and ban
PlayerKickBanTask task = new PlayerKickBanTask(player, GriefPrevention.instance.config_spam_banMessage);
PlayerKickBanTask task = new PlayerKickBanTask(player, GriefPrevention.instance.config_spam_banMessage, true);
GriefPrevention.instance.getServer().getScheduler().scheduleSyncDelayedTask(GriefPrevention.instance, task, 1L);
}
else
@ -321,7 +321,7 @@ class PlayerEventHandler implements Listener
GriefPrevention.AddLogEntry("Kicking " + player.getName() + " for spam.", CustomLogEntryTypes.AdminActivity);
//just kick
PlayerKickBanTask task = new PlayerKickBanTask(player, null);
PlayerKickBanTask task = new PlayerKickBanTask(player, "", false);
GriefPrevention.instance.getServer().getScheduler().scheduleSyncDelayedTask(GriefPrevention.instance, task, 1L);
}
@ -574,30 +574,9 @@ class PlayerEventHandler implements Listener
}
}
//ensure we're not over the limit for this IP address
InetAddress ipAddress = event.getAddress();
String ipAddressString = ipAddress.toString();
int ipLimit = GriefPrevention.instance.config_ipLimit;
if(ipLimit > 0)
{
Integer ipCount = this.ipCountHash.get(ipAddressString);
if(ipCount == null) ipCount = 0;
if(ipCount >= ipLimit)
{
event.setResult(Result.KICK_OTHER);
event.setKickMessage("Sorry, there are too many players logged in with your IP address.");
event.disallow(event.getResult(), event.getKickMessage());
return;
}
else
{
this.ipCountHash.put(ipAddressString, ipCount + 1);
}
}
//remember the player's ip address
PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
playerData.ipAddress = ipAddress;
playerData.ipAddress = event.getAddress();
}
//when a player successfully joins the server...
@ -693,7 +672,7 @@ class PlayerEventHandler implements Listener
}
//ban player
PlayerKickBanTask task = new PlayerKickBanTask(player, "");
PlayerKickBanTask task = new PlayerKickBanTask(player, "", true);
GriefPrevention.instance.getServer().getScheduler().scheduleSyncDelayedTask(GriefPrevention.instance, task, 10L);
//silence join message
@ -707,6 +686,30 @@ class PlayerEventHandler implements Listener
//in case player has changed his name, on successful login, update UUID > Name mapping
GriefPrevention.cacheUUIDNamePair(player.getUniqueId(), player.getName());
//ensure we're not over the limit for this IP address
InetAddress ipAddress = playerData.ipAddress;
String ipAddressString = ipAddress.toString();
int ipLimit = GriefPrevention.instance.config_ipLimit;
if(ipLimit > 0 && !player.hasAchievement(Achievement.MINE_WOOD))
{
Integer ipCount = this.ipCountHash.get(ipAddressString);
if(ipCount == null) ipCount = 0;
if(ipCount >= ipLimit)
{
//kick player
PlayerKickBanTask task = new PlayerKickBanTask(player, "Sorry, there are too many players logged in with your IP address.", false);
GriefPrevention.instance.getServer().getScheduler().scheduleSyncDelayedTask(GriefPrevention.instance, task, 10L);
//silence join message
event.setJoinMessage("");
return;
}
else
{
this.ipCountHash.put(ipAddressString, ipCount + 1);
}
}
}
//when a player spawns, conditionally apply temporary pvp protection
@ -815,7 +818,7 @@ class PlayerEventHandler implements Listener
this.dataStore.clearCachedPlayerData(playerID);
//reduce count of players with that player's IP address
if(GriefPrevention.instance.config_ipLimit > 0)
if(GriefPrevention.instance.config_ipLimit > 0 && !player.hasAchievement(Achievement.MINE_WOOD))
{
InetAddress ipAddress = playerData.ipAddress;
if(ipAddress != null)

18
src/me/ryanhamshire/GriefPrevention/PlayerKickBanTask.java
View File

@ -28,19 +28,23 @@ class PlayerKickBanTask implements Runnable
//player to kick or ban
private Player player;
//ban message. if null, don't ban
private String banReason;
//message to send player.
private String reason;
public PlayerKickBanTask(Player player, String banReason)
//whether to ban
private boolean ban;
public PlayerKickBanTask(Player player, String reason, boolean ban)
{
this.player = player;
this.banReason = banReason;
this.reason = reason;
this.ban = ban;
}
@Override
public void run()
{
if(this.banReason != null)
if(this.ban)
{
//ban
this.player.setBanned(true);
@ -48,12 +52,12 @@ class PlayerKickBanTask implements Runnable
//kick
if(this.player.isOnline())
{
this.player.kickPlayer(this.banReason);
this.player.kickPlayer(this.reason);
}
}
else if(this.player.isOnline())
{
this.player.kickPlayer("");
this.player.kickPlayer(this.reason);
}
}
}