1 files changed, 6 insertions, 5 deletions

diff --git a/source/game/StarPlayer.cpp b/source/game/StarPlayer.cpp
index 24a3c16..48368ec 100644
--- a/source/game/StarPlayer.cpp
+++ b/source/game/StarPlayer.cpp
@@ -1021,16 +1021,16 @@ void Player::update(float dt, uint64_t) {
     || m_humanoid->danceCyclicOrEnded() || m_movementController->running())
     m_humanoid->setDance({});
 
+  bool isClient = world()->isClient();
+  if (isClient)
+    m_armor->setupHumanoidClothingDrawables(*m_humanoid, forceNude());
+
   m_tools->suppressItems(suppressedItems);
   m_tools->tick(dt, m_shifting, m_pendingMoves);
   
   if (auto overrideFacingDirection = m_tools->setupHumanoidHandItems(*m_humanoid, position(), aimPosition()))
     m_movementController->controlFace(*overrideFacingDirection);
 
-  bool isClient = world()->isClient();
-  if (isClient)
-    m_armor->setupHumanoidClothingDrawables(*m_humanoid, forceNude());
-
   m_effectsAnimator->resetTransformationGroup("flip");
   if (m_movementController->facingDirection() == Direction::Left)
     m_effectsAnimator->scaleTransformationGroup("flip", Vec2F(-1, 1));
@@ -1100,7 +1100,8 @@ void Player::update(float dt, uint64_t) {
         }
       }
       m_humanoid->setHeadRotation(headRotation);
-      setSecretProperty("humanoid.headRotation", headRotation);
+      if (isMaster())
+        setSecretProperty("humanoid.headRotation", headRotation);
     }
   }