diff --git a/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java b/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java
index df4d3821..07d65e1d 100644
--- a/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java	
+++ b/2006Redone Server/src/com/rebotted/game/content/combat/npcs/NpcEmotes.java	
@@ -165,26 +165,43 @@ public enum NpcEmotes {
 		return -1;
 	}
 
-	public static int getDeadEmote(Player player, int i) {
-		for (NpcEmotes e : NpcEmotes.values()) {
-			for (int f = 0; f < e.getNpcId().length; f++) {
-				if (NpcHandler.npcs[i].npcType == e.getNpcId()[f]) {
-					return e.getDead();
-				} else {
-					switch (NpcHandler.npcs[i].npcType) {
+//	public static int getDeadEmote(Player player, int i) {
+//		for (NpcEmotes e : NpcEmotes.values()) {
+//			for (int f = 0; f < e.getNpcId().length; f++) {
+//				if (NpcHandler.npcs[i].npcType == e.getNpcId()[f]) {
+//					return e.getDead();
+//				} else {
+//					switch (NpcHandler.npcs[i].npcType) {
+//					case 2745:
+//						return 2654;
+//					case 1158:
+//						GameEngine.npcHandler.spawnSecondForm(player, i);
+//						return 6242;
+//					case 1160:
+//						GameEngine.npcHandler.spawnFirstForm(player, i);
+//						return 6233;
+//					}
+//				}
+//			}
+//		}
+//		return 2304;
+//	}
+//
+//}
+public static int getDeadEmote(int i) {
+	for (NpcEmotes e : NpcEmotes.values()) {
+		for (int f = 0; f < e.getNpcId().length; f++) {
+			if (NpcHandler.npcs[i].npcType == e.getNpcId()[f]) {
+				return e.getDead();
+			} else {
+				switch (NpcHandler.npcs[i].npcType) {
 					case 2745:
 						return 2654;
-					case 1158:
-						GameEngine.npcHandler.spawnSecondForm(player, i);
-						return 6242;
-					case 1160:
-						GameEngine.npcHandler.spawnFirstForm(player, i);
-						return 6233;
-					}
 				}
 			}
 		}
-		return 2304;
 	}
+	return 2304;
+}
 
 }
\ No newline at end of file
diff --git a/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java b/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java
index 73cd2f10..ae14d0d4 100644
--- a/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java	
+++ b/2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java	
@@ -651,11 +651,15 @@ public class NpcHandler {
 							&& npcs[i].needRespawn == false) {
 						npcs[i].updateRequired = true;
 						npcs[i].facePlayer(0);
+						if (npcs[i].killedBy <= 0)
+							npcs[i].killedBy = NpcData.getNpcKillerId(i);
+						npcs[i].animNumber = NpcEmotes.getDeadEmote(i); // dead
+						// emote
 						Player c = (Client) PlayerHandler.players[npcs[i].killedBy];
 						if (c != null) {
-							if (npcs[i].killedBy <= 0)
-								npcs[i].killedBy = NpcData.getNpcKillerId(i);
-							npcs[i].animNumber = NpcEmotes.getDeadEmote(c, i); // dead emote
+//							if (npcs[i].killedBy <= 0)
+//								npcs[i].killedBy = NpcData.getNpcKillerId(i);
+//							npcs[i].animNumber = NpcEmotes.getDeadEmote(c, i); // dead emote
 							if (CombatConstants.COMBAT_SOUNDS
 									&& NpcHandler.npcs[i].npcType < 3177
 									&& NpcHandler.npcs[i].npcType > 3180) {