From da4f0fda738de9453bc81868c958e4bbf70f773a Mon Sep 17 00:00:00 2001
From: ryanhamshire <ryanhamshire@live.com>
Date: Wed, 11 Feb 2015 19:01:41 -0800
Subject: [PATCH] Bug fixes for animal vs splash potion protections.

---
 src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java | 6 +++---
 src/me/ryanhamshire/GriefPrevention/GriefPrevention.java    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
index 5f55806..92e2843 100644
--- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
@@ -887,22 +887,22 @@ class EntityEventHandler implements Listener
 	    for(PotionEffect effect : effects)
 	    {
 	        PotionEffectType effectType = effect.getType();
-	        
 	        //restrict some potions on claimed animals (griefers could use this to kill or steal animals over fences)
-	        if(effectType == PotionEffectType.JUMP || effectType == PotionEffectType.POISON)
+	        if(effectType.getName().equals("JUMP") || effectType.getName().equals("POISON"))
 	        {
 	            for(LivingEntity effected : event.getAffectedEntities())
 	            {
 	                Claim cachedClaim = null; 
 	                if(effected instanceof Animals)
 	                {
-	                      Claim claim = this.dataStore.getClaimAt(effected.getLocation(), false, cachedClaim);
+	                    Claim claim = this.dataStore.getClaimAt(effected.getLocation(), false, cachedClaim);
 	                      if(claim != null)
 	                      {
 	                          cachedClaim = claim;
 	                          if(claim.allowContainers(thrower) != null)
 	                          {
 	                              event.setCancelled(true);
+	                              GriefPrevention.sendMessage(thrower, TextMode.Err, Messages.NoDamageClaimedEntity, claim.getOwnerName());
 	                              return;
 	                          }
 	                      }
diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
index c2f530a..6068ffa 100644
--- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
+++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
@@ -998,7 +998,6 @@ public class GriefPrevention extends JavaPlugin
 			}
 			catch(Exception e)
 			{
-				e.printStackTrace();
 			    GriefPrevention.sendMessage(player, TextMode.Instr, Messages.TransferTopLevel);
 				return true;
 			}