From e1e122ae9bb2a0942138a5f8a34b926efc457040 Mon Sep 17 00:00:00 2001
From: Hanro50 <hlareman2@gmail.com>
Date: Sat, 25 Oct 2025 09:53:14 +0200
Subject: [PATCH] Fixed crash with mannequin

---
 .../java/tschipp/carryon/client/render/CarriedObjectRender.java | 2 +-
 .../tschipp/carryon/client/render/CarryingItemRenderLayer.java  | 2 +-
 .../main/java/tschipp/carryon/mixin/EntityRendererMixin.java    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java b/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java
index 3ce70e7..c272d11 100644
--- a/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java
+++ b/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java
@@ -51,7 +51,7 @@ public class CarriedObjectRender
 {
 	public static boolean draw(Player player, PoseStack matrix, int light, float partialTicks,SubmitNodeCollector nodeCollector, boolean firstPerson)
 	{
-		if(Services.PLATFORM.isModLoaded("firstperson") || Services.PLATFORM.isModLoaded("firstpersonmod"))
+		if(Services.PLATFORM.isModLoaded("firstperson") || Services.PLATFORM.isModLoaded("firstpersonmod") || player == null)
 			return false;
 
 		CarryOnData carry = CarryOnDataManager.getCarryData(player);
diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarryingItemRenderLayer.java b/Common/src/main/java/tschipp/carryon/client/render/CarryingItemRenderLayer.java
index 98e41a1..876ce7f 100644
--- a/Common/src/main/java/tschipp/carryon/client/render/CarryingItemRenderLayer.java
+++ b/Common/src/main/java/tschipp/carryon/client/render/CarryingItemRenderLayer.java
@@ -16,7 +16,7 @@ public class CarryingItemRenderLayer<M extends PlayerModel> extends RenderLayer<
     public void submit(PoseStack poseStack, SubmitNodeCollector nodeCollector, int packedLight,
         AvatarRenderState renderState, float yRot, float xRot) {
         if (renderState instanceof ICarryOnRenderState carryOnRenderState){
-                CarriedObjectRender.draw(carryOnRenderState.getPlayer(), poseStack, packedLight, 0, nodeCollector,false);
+            CarriedObjectRender.draw(carryOnRenderState.getPlayer(), poseStack, packedLight, 0, nodeCollector,false);
         }
     }
 }
diff --git a/Common/src/main/java/tschipp/carryon/mixin/EntityRendererMixin.java b/Common/src/main/java/tschipp/carryon/mixin/EntityRendererMixin.java
index 8a08264..7059083 100644
--- a/Common/src/main/java/tschipp/carryon/mixin/EntityRendererMixin.java
+++ b/Common/src/main/java/tschipp/carryon/mixin/EntityRendererMixin.java
@@ -23,7 +23,6 @@ public class EntityRendererMixin {
             shift = At.Shift.AFTER
     ), method = "createRenderState(Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/client/renderer/entity/state/EntityRenderState;")
     private void onCreateRenderState(Entity entity, float $$1, CallbackInfoReturnable<EntityRenderState> cir, @Local(ordinal = 0) EntityRenderState state) {
-
         if (entity instanceof Player player) {
             CarryOnData carry = CarryOnDataManager.getCarryData(player);