From f8566437d53873ca91c4889385a6e6ec71ff8dd8 Mon Sep 17 00:00:00 2001
From: LCastr0 <castr0mmbr@gmail.com>
Date: Fri, 28 Apr 2017 21:23:19 -0300
Subject: [PATCH] Fixed shimmering rings

---
 .../ShimmeringRingKitSelector.java            | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/ShimmeringRingKitSelector.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/ShimmeringRingKitSelector.java
index a5c651595..9bd9282cd 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/ShimmeringRingKitSelector.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/kitselector/ShimmeringRingKitSelector.java
@@ -5,7 +5,6 @@ import java.util.Map;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
@@ -70,9 +69,15 @@ public class ShimmeringRingKitSelector extends KitSelectorGadget
 
 		// Updates height and direction of particles
 		double height = _circleHeight.get(entity);
-		boolean up = (height == 0) || ((height == getEntityHeight(entity)) ? false : _direction.get(entity));
-		_direction.put(entity, up);
-		if (up)
+		if (height <= 0)
+		{
+			_direction.put(entity, true);
+		}
+		else if (height >= getEntityHeight(entity))
+		{
+			_direction.put(entity, false);
+		}
+		if (_direction.get(entity))
 			height += 0.1;
 		else
 			height -= 0.1;
@@ -90,8 +95,26 @@ public class ShimmeringRingKitSelector extends KitSelectorGadget
 
 	private double getEntityHeight(Entity entity)
 	{
-		net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) entity).getHandle();
-		return nmsEntity.getBoundingBox().e - nmsEntity.getBoundingBox().b;
+		switch (entity.getType())
+		{
+			case SHEEP:
+			case PIG:
+			case BAT:
+			case MAGMA_CUBE:
+			case GUARDIAN:
+			case CHICKEN:
+			case SLIME:
+			case SQUID:
+			case WOLF:
+			case OCELOT:
+				return 0.75;
+			case SPIDER:
+			case CAVE_SPIDER:
+				return 0.5;
+			case ENDERMAN:
+				return 3;
+		}
+		return 2;
 	}
 
 }