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/GhastModel.cpp b/Minecraft.Client/GhastModel.cpp
index 460c28ff..14277c43 100644
--- a/Minecraft.Client/GhastModel.cpp
+++ b/Minecraft.Client/GhastModel.cpp
@@ -34,7 +34,7 @@ GhastModel::GhastModel() : Model()
 	}
 }
 
-void GhastModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim)
+void GhastModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim)
 {
     for (int i = 0; i < TENTACLESLENGTH; i++) // 4J - 9 was  tentacles.length
 	{
@@ -44,7 +44,7 @@ void GhastModel::setupAnim(float time, float r, float bob, float yRot, float xRo
 
 void GhastModel::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);
 
 	glPushMatrix();
 	glTranslatef(0, .6f, 0);