From 84e4c773756893460a5a4f545bbf5970b6620456 Mon Sep 17 00:00:00 2001
From: ryanhamshire <ryanhamshire@live.com>
Date: Sat, 16 Feb 2013 14:07:42 -0800
Subject: [PATCH] 7.6.2

---
 plugin.yml                                             |  2 +-
 .../GriefPrevention/EntityEventHandler.java            |  2 +-
 .../GriefPrevention/PlayerEventHandler.java            | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugin.yml b/plugin.yml
index ad80f83..d74fbe9 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -2,7 +2,7 @@ name: GriefPrevention
 main: me.ryanhamshire.GriefPrevention.GriefPrevention
 softdepend: [Vault, Multiverse-Core, My Worlds, MystCraft, Transporter]
 dev-url: http://dev.bukkit.org/server-mods/grief-prevention
-version: 7.6.1
+version: 7.6.2
 commands:
    abandonclaim:
       description: Deletes a claim.
diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
index 7fd9bb6..18db894 100644
--- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
@@ -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
-		else if(event.getEntityType() == EntityType.WITHER)
+		else if(event.getEntityType() == EntityType.WITHER && GriefPrevention.instance.config_claims_enabledWorlds.contains(event.getBlock().getWorld()))
 		{
 			event.setCancelled(true);
 		}
diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
index e0cceea..edb6863 100644
--- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
@@ -138,8 +138,6 @@ class PlayerEventHandler implements Listener
 			if(event instanceof AsyncPlayerChatEvent && !message.contains("/"))
 			{
 				((AsyncPlayerChatEvent)event).setMessage(message.toLowerCase());
-				playerData.spamCount++;
-				spam = true;				
 			}
 		}
 		
@@ -172,7 +170,7 @@ class PlayerEventHandler implements Listener
 			Matcher matcher = ipAddressPattern.matcher(message);
 			
 			//if it looks like an IP address
-			while(matcher.find())
+			if(matcher.find())
 			{
 				//and it's not in the list of allowed IP addresses
 				if(!GriefPrevention.instance.config_spam_allowedIpAddresses.contains(matcher.group()))
@@ -218,14 +216,14 @@ class PlayerEventHandler implements Listener
 		}
 		
 		//very short messages close together are spam
-		if(!muted && message.length() < 5 && millisecondsSinceLastMessage < 5000)
+		if(!muted && message.length() < 5 && millisecondsSinceLastMessage < 3000)
 		{
 			spam = true;
 			playerData.spamCount++;
 		}
 		
 		//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 
 			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
 			//anything above level 2, mute and warn
-			if(playerData.spamCount >= 3)
+			if(playerData.spamCount >= 4)
 			{
 				muted = true;
 				if(!playerData.spamWarned)