From cb19eef701b5c9e27d0464795fffcf8a4d795a21 Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Sat, 22 Jul 2023 22:31:04 +1000
Subject: Add character swapping (no GUI yet)

---
 source/frontend/StarTeamBar.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source/frontend/StarTeamBar.cpp')

diff --git a/source/frontend/StarTeamBar.cpp b/source/frontend/StarTeamBar.cpp
index 192edfa..a378040 100644
--- a/source/frontend/StarTeamBar.cpp
+++ b/source/frontend/StarTeamBar.cpp
@@ -40,7 +40,7 @@ TeamBar::TeamBar(MainInterface* mainInterface, UniverseClientPtr client) {
         return;
       auto position = jsonToVec2I(Root::singleton().assets()->json("/interface/windowconfig/teambar.config:selfMenuOffset"));
       position[1] += windowHeight() / m_guiContext->interfaceScale();
-      showMemberMenu(m_client->mainPlayer()->clientContext()->serverUuid(), position);
+      showMemberMenu(m_client->mainPlayer()->clientContext()->playerUuid(), position);
     });
 
   reader.construct(assets->json("/interface/windowconfig/teambar.config:paneLayout"), this);
@@ -155,7 +155,7 @@ void TeamBar::buildTeamBar() {
   int memberSize = assets->json("/interface/windowconfig/teambar.config:memberSize").toInt();
   int memberSpacing = assets->json("/interface/windowconfig/teambar.config:memberSpacing").toInt();
 
-  Uuid myUuid = player->clientContext()->serverUuid();
+  Uuid myUuid = player->clientContext()->playerUuid();
   for (auto member : teamClient->members()) {
     if (member.uuid == myUuid) {
       memberIndex++;
@@ -360,7 +360,7 @@ void TeamMemberMenu::update(float dt) {
 
 void TeamMemberMenu::updateWidgets() {
   bool isLeader = m_owner->m_client->teamClient()->isTeamLeader();
-  bool isSelf = m_owner->m_client->mainPlayer()->clientContext()->serverUuid() == m_memberUuid;
+  bool isSelf = m_owner->m_client->mainPlayer()->clientContext()->playerUuid() == m_memberUuid;
 
   fetchChild<ButtonWidget>("beamToShip")->setEnabled(m_canBeam);
   fetchChild<ButtonWidget>("makeLeader")->setEnabled(isLeader && !isSelf);
-- 
cgit v1.2.3