From 69517a3dcb67f179327c5a3399660d1a79f6b7e8 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 25 Sep 2015 14:08:27 +1200
Subject: [PATCH] Refresh the name after custom stuff is done so it applies on
 disguises

---
 .../src/mineplex/minecraft/game/core/boss/EventCreature.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventCreature.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventCreature.java
index ef0cf3789..8ae2812b6 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventCreature.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/EventCreature.java
@@ -68,9 +68,9 @@ public abstract class EventCreature<T extends LivingEntity> implements Listener
 
 		setEntity(entity);
 		updateEntityHealth();
-		updateName();
 		entity.setRemoveWhenFarAway(false);
 		spawnCustom();
+		updateName();
 	}
 
 	protected abstract void spawnCustom();
@@ -306,7 +306,7 @@ public abstract class EventCreature<T extends LivingEntity> implements Listener
 		if (cause == DamageCause.FALL && !getEvent().getCondition().HasCondition(_entity, ConditionType.FALLING, null))
 			event.SetCancelled("Cancel");
 
-		if (cause == DamageCause.DROWNING || cause == DamageCause.FALL || cause == DamageCause.SUFFOCATION)
+		if (cause == DamageCause.DROWNING || cause == DamageCause.SUFFOCATION)
 			event.SetCancelled("Cancel");
 	}