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/SilverfishModel.cpp b/Minecraft.Client/SilverfishModel.cpp
index 128a7e79..ce8b8254 100644
--- a/Minecraft.Client/SilverfishModel.cpp
+++ b/Minecraft.Client/SilverfishModel.cpp
@@ -84,7 +84,7 @@ int SilverfishModel::modelVersion()
 
 void SilverfishModel::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);
 
 	for (unsigned int i = 0; i < bodyParts.length; i++)
 	{
@@ -96,14 +96,14 @@ void SilverfishModel::render(shared_ptr<Entity> entity, float time, float r, flo
 	}
 }
 
-void SilverfishModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim)
+void SilverfishModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim)
 {
-
 	for (unsigned int i = 0; i < bodyParts.length; i++)
 	{
 		bodyParts[i]->yRot = Mth::cos(bob * .9f + i * .15f * PI) * PI * .05f * (1 + abs((int)i - 2));
 		bodyParts[i]->x = Mth::sin(bob * .9f + i * .15f * PI) * PI * .2f * abs((int)i - 2);
 	}
+
 	bodyLayers[0]->yRot = bodyParts[2]->yRot;
 	bodyLayers[1]->yRot = bodyParts[4]->yRot;
 	bodyLayers[1]->x = bodyParts[4]->x;