From 5b27cb8ec6438aa173908e862b0b39e7a395c708 Mon Sep 17 00:00:00 2001 From: Tschipp Date: Mon, 22 Jan 2018 00:01:09 +0100 Subject: [PATCH] 1.10 Render Crash --- src/main/java/tschipp/carryon/client/event/RenderEvents.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/tschipp/carryon/client/event/RenderEvents.java b/src/main/java/tschipp/carryon/client/event/RenderEvents.java index fbb9c92..7d9a8b0 100644 --- a/src/main/java/tschipp/carryon/client/event/RenderEvents.java +++ b/src/main/java/tschipp/carryon/client/event/RenderEvents.java @@ -206,7 +206,7 @@ public class RenderEvents if (perspective == 0) { - IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileStack, world, player); + IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileStack == null ? stack : tileStack, world, player); CarryOnOverride carryOverride = ScriptChecker.getOverride(player); if (carryOverride != null) @@ -377,7 +377,7 @@ public class RenderEvents GlStateManager.translate(0, -0.3, 0); } - IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileItem, world, player); + IBakedModel model = ModelOverridesHandler.hasCustomOverrideModel(state, tag) ? ModelOverridesHandler.getCustomOverrideModel(state, tag, world, player) : Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(tileItem == null ? stack : tileItem, world, player); CarryOnOverride carryOverride = ScriptChecker.getOverride(player); if (carryOverride != null)