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

7.6.2

Browse Source
This commit is contained in:
ryanhamshire 2013-02-16 14:07:42 -08:00
parent 37ca831612
commit 84e4c77375
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -2,7 +2,7 @@ name: GriefPrevention
main: me.ryanhamshire.GriefPrevention.GriefPrevention main: me.ryanhamshire.GriefPrevention.GriefPrevention
softdepend: [Vault, Multiverse-Core, My Worlds, MystCraft, Transporter] softdepend: [Vault, Multiverse-Core, My Worlds, MystCraft, Transporter]
dev-url: http://dev.bukkit.org/server-mods/grief-prevention dev-url: http://dev.bukkit.org/server-mods/grief-prevention
version: 7.6.1 version: 7.6.2
commands: commands:
abandonclaim: abandonclaim:
description: Deletes a claim. description: Deletes a claim.

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

@ -82,7 +82,7 @@ class EntityEventHandler implements Listener
} }
//don't allow the wither to break blocks, when the wither is determined, too expensive to constantly check for claimed blocks //don't allow the wither to break blocks, when the wither is determined, too expensive to constantly check for claimed blocks
else if(event.getEntityType() == EntityType.WITHER) else if(event.getEntityType() == EntityType.WITHER && GriefPrevention.instance.config_claims_enabledWorlds.contains(event.getBlock().getWorld()))
{ {
event.setCancelled(true); event.setCancelled(true);
} }

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

@ -138,8 +138,6 @@ class PlayerEventHandler implements Listener
if(event instanceof AsyncPlayerChatEvent && !message.contains("/")) if(event instanceof AsyncPlayerChatEvent && !message.contains("/"))
{ {
((AsyncPlayerChatEvent)event).setMessage(message.toLowerCase()); ((AsyncPlayerChatEvent)event).setMessage(message.toLowerCase());
playerData.spamCount++;
spam = true;
} }
} }
@ -172,7 +170,7 @@ class PlayerEventHandler implements Listener
Matcher matcher = ipAddressPattern.matcher(message); Matcher matcher = ipAddressPattern.matcher(message);
//if it looks like an IP address //if it looks like an IP address
while(matcher.find()) if(matcher.find())
{ {
//and it's not in the list of allowed IP addresses //and it's not in the list of allowed IP addresses
if(!GriefPrevention.instance.config_spam_allowedIpAddresses.contains(matcher.group())) if(!GriefPrevention.instance.config_spam_allowedIpAddresses.contains(matcher.group()))
@ -218,14 +216,14 @@ class PlayerEventHandler implements Listener
} }
//very short messages close together are spam //very short messages close together are spam
if(!muted && message.length() < 5 && millisecondsSinceLastMessage < 5000) if(!muted && message.length() < 5 && millisecondsSinceLastMessage < 3000)
{ {
spam = true; spam = true;
playerData.spamCount++; playerData.spamCount++;
} }
//if the message was determined to be a spam, consider taking action //if the message was determined to be a spam, consider taking action
if(!player.hasPermission("griefprevention.spam") && spam) if(spam)
{ {
//anything above level 8 for a player which has received a warning... kick or if enabled, ban //anything above level 8 for a player which has received a warning... kick or if enabled, ban
if(playerData.spamCount > 8 && playerData.spamWarned) if(playerData.spamCount > 8 && playerData.spamWarned)
@ -254,7 +252,7 @@ class PlayerEventHandler implements Listener
//cancel any messages while at or above the third spam level and issue warnings //cancel any messages while at or above the third spam level and issue warnings
//anything above level 2, mute and warn //anything above level 2, mute and warn
if(playerData.spamCount >= 3) if(playerData.spamCount >= 4)
{ {
muted = true; muted = true;
if(!playerData.spamWarned) if(!playerData.spamWarned)