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/VillagerZombieModel.cpp b/Minecraft.Client/VillagerZombieModel.cpp
index d8338c89..25b8f66e 100644
--- a/Minecraft.Client/VillagerZombieModel.cpp
+++ b/Minecraft.Client/VillagerZombieModel.cpp
@@ -40,9 +40,9 @@ int VillagerZombieModel::version()
 	return 10;
 }
 
-void VillagerZombieModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim)
+void VillagerZombieModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim)
 {
-	HumanoidModel::setupAnim(time, r, bob, yRot, xRot, scale, uiBitmaskOverrideAnim);
+	HumanoidModel::setupAnim(time, r, bob, yRot, xRot, scale, entity, uiBitmaskOverrideAnim);
 
 	float attack2 = Mth::sin(attackTime * PI);
 	float attack = Mth::sin((1 - (1 - attackTime) * (1 - attackTime)) * PI);