From 1293fabca9f7ca7bca3a0ecc8f12f05ffbdd9389 Mon Sep 17 00:00:00 2001
From: "Luis C.M" <lc0508383@gmail.com>
Date: Mon, 13 Jun 2022 00:47:39 -0500
Subject: [PATCH] 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.
---
 .../java/noppes/npcs/client/ClientEventHandler.java  | 12 ++++--------
 .../npcs/client/renderer/RenderCNPCPlayer.java       |  8 +++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/noppes/npcs/client/ClientEventHandler.java b/src/main/java/noppes/npcs/client/ClientEventHandler.java
index 520598787..89857c371 100644
--- a/src/main/java/noppes/npcs/client/ClientEventHandler.java
+++ b/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
diff --git a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java
index 86046afec..80254c3eb 100644
--- a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java
+++ b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java
@@ -2,6 +2,7 @@ package noppes.npcs.client.renderer;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.model.ModelBiped;
@@ -9,6 +10,7 @@ import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderBiped;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.entity.Entity;
@@ -149,11 +151,15 @@ public class RenderCNPCPlayer extends RenderPlayer {
             }
         }
     }
+
+    protected int shouldRenderPass(AbstractClientPlayer p_77032_1_, int p_77032_2_, float p_77032_3_)
+    {
+        return -1;
+    }
     
     public void renderHand(float partialTicks, int renderPass) {
         Minecraft mc = Minecraft.getMinecraft();
         EntityRenderer entityRenderer = mc.entityRenderer;
-        EntityClientPlayerMP player = mc.thePlayer;
 
         if (entityRenderer.debugViewDirection <= 0)
         {