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

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

1 files changed, 3 insertions, 3 deletions

diff --git a/Minecraft.Client/VillagerGolemModel.cpp b/Minecraft.Client/VillagerGolemModel.cpp
index aaeabd53..e8b1bf27 100644
--- a/Minecraft.Client/VillagerGolemModel.cpp
+++ b/Minecraft.Client/VillagerGolemModel.cpp
@@ -38,7 +38,7 @@ VillagerGolemModel::VillagerGolemModel(float g, float yOffset)
 
 void VillagerGolemModel::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);
@@ -48,7 +48,7 @@ void VillagerGolemModel::render(shared_ptr<Entity> entity, float time, float r,
 	arm1->render(scale, usecompiled);
 }
 
-void VillagerGolemModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim)
+void VillagerGolemModel::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);
@@ -59,7 +59,7 @@ void VillagerGolemModel::setupAnim(float time, float r, float bob, float yRot, f
 	leg1->yRot = 0;
 }
 
-void VillagerGolemModel::prepareMobModel(shared_ptr<Mob> mob, float time, float r, float a)
+void VillagerGolemModel::prepareMobModel(shared_ptr<LivingEntity> mob, float time, float r, float a)
 {
 	shared_ptr<VillagerGolem> vg = dynamic_pointer_cast<VillagerGolem>(mob);
 	int attackTick = vg->getAttackAnimationTick();