dont rotate players in custom wardrobe

Signed-off-by: ItsEmpa <itsempa@users.noreply.github.com>
hannibal002 · Sep 2, 2024 · dc6c5ec · dc6c5ec
1 parent 4dce16a
commit dc6c5ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java b/...hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.mixins.transformers.renderer;
 
 import at.hannibal2.skyhanni.mixins.hooks.RendererLivingEntityHook;
+import at.hannibal2.skyhanni.utils.FakePlayer;
 import net.minecraft.client.renderer.entity.RendererLivingEntity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -33,8 +34,9 @@ private boolean alwaysMarkAsHavingCape(EntityPlayer instance, EnumPlayerModelPar
         return true;
     }
 
-    @Inject(method = "rotateCorpse", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/EnumChatFormatting;getTextWithoutFormattingCodes(Ljava/lang/String;)Ljava/lang/String;", shift = At.Shift.AFTER))
+    @Inject(method = "rotateCorpse", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/EnumChatFormatting;getTextWithoutFormattingCodes(Ljava/lang/String;)Ljava/lang/String;", shift = At.Shift.AFTER), cancellable = true)
     private void rotateThePlayer(T bat, float p_77043_2_, float p_77043_3_, float partialTicks, CallbackInfo ci) {
+        if (bat instanceof FakePlayer) ci.cancel();
         if (bat instanceof EntityPlayer) {
             RendererLivingEntityHook.rotatePlayer((EntityPlayer) bat);
         }

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -215,10 +215,11 @@ object EntityUtils {
         SkyHanniRenderEntityEvent.Post(event.entity, event.renderer, event.x, event.y, event.z).postAndCatch()
     }
 
-    //#if MC < 11400
+//#if MC < 11400
     @SubscribeEvent
     fun onEntityRenderSpecialsPre(
-        event: RenderLivingEvent.Specials.Pre<*>,
+        event:
+        RenderLivingEvent.Specials.Pre<*>,
     ) {
         val shEvent = SkyHanniRenderEntityEvent.Specials.Pre(event.entity, event.renderer, event.x, event.y, event.z)
         if (shEvent.postAndCatch()) {
@@ -228,7 +229,8 @@ object EntityUtils {
 
     @SubscribeEvent
     fun onEntityRenderSpecialsPost(
-        event: RenderLivingEvent.Specials.Post<*>,
+        event:
+        RenderLivingEvent.Specials.Post<*>,
     ) {
         SkyHanniRenderEntityEvent.Specials.Post(event.entity, event.renderer, event.x, event.y, event.z).postAndCatch()
     }