Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/game/StarUniverseClient.cpp
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2023-07-26 19:02:33 +1000
committerKae <80987908+Novaenia@users.noreply.github.com>2023-07-26 19:02:33 +1000
commitf2afd91d0fcf4c4099e0617e6f103fd7142c18df (patch)
tree13432d9ace5e558ce0534b09fbc40da966b89d7e /source/game/StarUniverseClient.cpp
parentddab1db73ffa936b63b56679aa43a8e9dd70da2e (diff)
Fix Teams not functioning as swapped character
Diffstat (limited to 'source/game/StarUniverseClient.cpp')
-rw-r--r--source/game/StarUniverseClient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/game/StarUniverseClient.cpp b/source/game/StarUniverseClient.cpp
index 2ff4631..4f1dc27 100644
--- a/source/game/StarUniverseClient.cpp
+++ b/source/game/StarUniverseClient.cpp
@@ -394,7 +394,7 @@ CelestialCoordinate UniverseClient::shipCoordinate() const {
}
bool UniverseClient::playerOnOwnShip() const {
- return playerWorld().is<ClientShipWorldId>() && playerWorld().get<ClientShipWorldId>() == mainPlayer()->uuid();
+ return playerWorld().is<ClientShipWorldId>() && playerWorld().get<ClientShipWorldId>() == m_clientContext->playerUuid();
}
bool UniverseClient::playerIsOriginal() const {
@@ -412,7 +412,7 @@ bool UniverseClient::isAdmin() const {
Uuid UniverseClient::teamUuid() const {
if (auto team = m_teamClient->currentTeam())
return *team;
- return m_mainPlayer->uuid();
+ return m_clientContext->playerUuid();
}
WorldTemplateConstPtr UniverseClient::currentTemplate() const {