RenderCNPCPlayer changes in ClientEventHandler:

-Fixed cancelling an uncancellable armor render event.
-Only RenderPlayerEvent.Specials.Pre is cancelled, rather than trying to cancel both Pre & Post.

RenderCNPCPlayer:
-Now always returns -1 as a render pass.

src/main/java/noppes/npcs/client/ClientEventHandler.java

@@ -1,5 +1,6 @@
 package noppes.npcs.client;
 
+import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import net.minecraft.client.Minecraft;
@@ -37,15 +38,10 @@ public class ClientEventHandler {
     }
 
     @SubscribeEvent
-    public void cancelSpecials(RenderPlayerEvent.Specials event) {
-        if (event.renderer instanceof RenderCNPCPlayer)
-            event.setCanceled(true);
-    }
-
-    @SubscribeEvent
-    public void cancelSpecials(RenderPlayerEvent.SetArmorModel event) {
-        if (event.renderer instanceof RenderCNPCPlayer && event.stack != null && event.stack.getItem() instanceof ItemArmor)
+    public void cancelSpecials(RenderPlayerEvent.Specials.Pre event) {
+        if (event.renderer instanceof RenderCNPCPlayer) {
             event.setCanceled(true);
+        }
     }
 
     @SubscribeEvent