Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 2 insertions, 2 deletions

diff --git a/Minecraft.Client/CreeperModel.cpp b/Minecraft.Client/CreeperModel.cpp
index 51237ce6..dd9ef193 100644
--- a/Minecraft.Client/CreeperModel.cpp
+++ b/Minecraft.Client/CreeperModel.cpp
@@ -58,7 +58,7 @@ CreeperModel::CreeperModel(float g) : Model()
 
 void CreeperModel::render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled)
 {
-    setupAnim(time, r, bob, yRot, xRot, scale);
+    setupAnim(time, r, bob, yRot, xRot, scale, entity);
 
     head->render(scale, usecompiled);
     body->render(scale, usecompiled);
@@ -68,7 +68,7 @@ void CreeperModel::render(shared_ptr<Entity> entity, float time, float r, float
     leg3->render(scale, usecompiled);
 }
 
-void CreeperModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim)
+void CreeperModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim)
 {
     head->yRot = yRot / (float) (180 / PI);
     head->xRot = xRot / (float) (180 / PI);