From cd387284bfe4be8e065400cf3e8bfd8b93599b0e Mon Sep 17 00:00:00 2001
From: samczsun <github@samczsun.com>
Date: Sun, 12 Feb 2017 03:42:35 -0500
Subject: [PATCH] Ignore armorstands for fleshhook/snowball

---
 .../src/mineplex/core/common/Constants.java                   | 2 +-
 .../src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java  | 4 ++++
 .../src/mineplex/core/gadget/gadgets/item/ItemSnowball.java   | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Constants.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Constants.java
index 50b1a7649..32a6014cb 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Constants.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Constants.java
@@ -50,7 +50,7 @@ public class Constants
 
 			if (object.has("properties"))
 				profile.getProperties().putAll(context.deserialize(object.get("properties"), PropertyMap.class));
-			
+
 			return profile;
 		}
 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java
index 01904e133..6c454ebff 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java
@@ -4,6 +4,7 @@ import org.bukkit.EntityEffect;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
+import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -69,6 +70,9 @@ public class ItemFleshHook extends ItemGadget implements IThrown
 		if (Manager.collideEvent(player, this, target))
 			return;
 
+		if (target instanceof ArmorStand)
+			return;
+
 		//Pull
 		UtilAction.velocity(target, 
 				UtilAlg.getTrajectory(target.getLocation(), player.getLocation()), 
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java
index fd6e988e8..ebca74d1f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java
@@ -2,6 +2,7 @@ package mineplex.core.gadget.gadgets.item;
 
 import org.bukkit.Material;
 import org.bukkit.Sound;
+import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Snowball;
 import org.bukkit.event.EventHandler;
@@ -56,6 +57,8 @@ public class ItemSnowball extends ItemGadget
 		
 		if(Manager.collideEvent(_snowballs.remove(ball), this, event.getEntity())) return;
 
+		if (event.getEntity() instanceof ArmorStand)
+			return;
 		
 		UtilAction.velocity(event.getEntity(), event.getDamager().getVelocity().normalize().add(new Vector(0,0.5,0)).multiply(0.5));
 		event.getDamager().getWorld().playSound(event.getDamager().getLocation(), Sound.STEP_SNOW, 1, 0.5f);