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

Fixed too-aggressive IP address re-use limiter.

Browse Source
This commit is contained in:
ryanhamshire 2015-12-03 17:02:45 -08:00
parent fafea081a3
commit 0208bde89d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/me/ryanhamshire/GriefPrevention/PlayerData.java
View File

@ -147,6 +147,9 @@ public class PlayerData
//profanity warning, once per play session //profanity warning, once per play session
boolean profanityWarned = false; boolean profanityWarned = false;
//true when the player's IP address was counted against the re-use limit when he joined
boolean ipLimited = false;
//whether or not this player is "in" pvp combat //whether or not this player is "in" pvp combat
public boolean inPvpCombat() public boolean inPvpCombat()
{ {

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

@ -862,7 +862,7 @@ class PlayerEventHandler implements Listener
{ {
String ipAddressString = ipAddress.toString(); String ipAddressString = ipAddress.toString();
int ipLimit = GriefPrevention.instance.config_ipLimit; int ipLimit = GriefPrevention.instance.config_ipLimit;
if(ipLimit > 0 && !player.hasAchievement(Achievement.MINE_WOOD)) if(ipLimit > 0 && GriefPrevention.isNewToServer(player))
{ {
Integer ipCount = this.ipCountHash.get(ipAddressString); Integer ipCount = this.ipCountHash.get(ipAddressString);
if(ipCount == null) ipCount = 0; if(ipCount == null) ipCount = 0;
@ -873,12 +873,13 @@ class PlayerEventHandler implements Listener
GriefPrevention.instance.getServer().getScheduler().scheduleSyncDelayedTask(GriefPrevention.instance, task, 10L); GriefPrevention.instance.getServer().getScheduler().scheduleSyncDelayedTask(GriefPrevention.instance, task, 10L);
//silence join message //silence join message
event.setJoinMessage(""); event.setJoinMessage(null);
return; return;
} }
else else
{ {
this.ipCountHash.put(ipAddressString, ipCount + 1); this.ipCountHash.put(ipAddressString, ipCount + 1);
playerData.ipLimited = true;
} }
} }
} }
@ -990,11 +991,8 @@ class PlayerEventHandler implements Listener
if(player.getHealth() > 0) player.setHealth(0); //might already be zero from above, this avoids a double death message if(player.getHealth() > 0) player.setHealth(0); //might already be zero from above, this avoids a double death message
} }
//drop data about this player
this.dataStore.clearCachedPlayerData(playerID);
//reduce count of players with that player's IP address //reduce count of players with that player's IP address
if(GriefPrevention.instance.config_ipLimit > 0 && GriefPrevention.isNewToServer(player)) if(GriefPrevention.instance.config_ipLimit > 0 && playerData.ipLimited)
{ {
InetAddress ipAddress = playerData.ipAddress; InetAddress ipAddress = playerData.ipAddress;
if(ipAddress != null) if(ipAddress != null)
@ -1005,6 +1003,9 @@ class PlayerEventHandler implements Listener
this.ipCountHash.put(ipAddressString, count - 1); this.ipCountHash.put(ipAddressString, count - 1);
} }
} }
//drop data about this player
this.dataStore.clearCachedPlayerData(playerID);
} }
//determines whether or not a login or logout notification should be silenced, depending on how many there have been in the last minute //determines whether or not a login or logout notification should be silenced, depending on how many there have been in the last minute