From b51e174bdc158187fc110dc4a947946d3dc329c1 Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Fri, 18 Aug 2023 20:03:06 +1000
Subject: Item drops inherit player velocity, other stuff

---
 source/game/StarUniverseClient.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'source/game/StarUniverseClient.cpp')

diff --git a/source/game/StarUniverseClient.cpp b/source/game/StarUniverseClient.cpp
index 7d5adbb..3423f2d 100644
--- a/source/game/StarUniverseClient.cpp
+++ b/source/game/StarUniverseClient.cpp
@@ -551,10 +551,16 @@ bool UniverseClient::reloadPlayer(Json const& data, Uuid const& uuid, bool reset
 bool UniverseClient::switchPlayer(Uuid const& uuid) {
   if (uuid == mainPlayer()->uuid())
     return false;
-  else if (auto data = m_playerStorage->maybeGetPlayerData(uuid))
-    return reloadPlayer(*data, uuid, true, true);
-  else
-    return false;
+  else if (auto data = m_playerStorage->maybeGetPlayerData(uuid)) {
+    if (reloadPlayer(*data, uuid, true, true)) {
+      auto dance = Root::singleton().assets()->json("/player.config:swapDance");
+      if (dance.isType(Json::Type::String))
+        m_mainPlayer->humanoid()->setDance(dance.toString());
+      return true;
+    }
+  }
+
+  return false;
 }
 
 bool UniverseClient::switchPlayer(size_t index) {
-- 
cgit v1.2.3