From e3aa302a8c86d7d33afd2ae13a2bdacee141d2bf Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Mon, 21 Oct 2024 16:49:21 +1100
Subject: Move teamMembers impl to Lua bindings

avoiding including UniverseClient.hpp and TeamClient.hpp in StarPlayer
---
 source/game/StarPlayer.cpp | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

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

diff --git a/source/game/StarPlayer.cpp b/source/game/StarPlayer.cpp
index 15890bb..2f89ff3 100644
--- a/source/game/StarPlayer.cpp
+++ b/source/game/StarPlayer.cpp
@@ -35,8 +35,6 @@
 #include "StarInspectionTool.hpp"
 #include "StarUtilityLuaBindings.hpp"
 #include "StarCelestialLuaBindings.hpp"
-#include "StarUniverseClient.hpp"
-#include "StarTeamClient.hpp"
 
 namespace Star {
 
@@ -295,6 +293,10 @@ void Player::setUniverseClient(UniverseClient* client) {
   m_questManager->setUniverseClient(client);
 }
 
+UniverseClient* Player::universeClient() const {
+  return m_client;
+}
+
 EntityType Player::entityType() const {
   return EntityType::Player;
 }
@@ -2074,20 +2076,6 @@ Vec2F Player::nametagOrigin() const {
 void Player::updateIdentity()
 { m_identityUpdated = true; m_humanoid->setIdentity(m_identity); }
 
-JsonArray Player::teamMembers() {
-  JsonArray jarray;
-  for (auto member : m_client->teamClient()->members()) {
-    jarray.push_back(JsonObject{
-      {"name", member.name},
-      {"uuid", member.uuid.hex()},
-      {"entity", member.entity},
-      {"healthPercentage", member.healthPercentage},
-      {"energyPercentage", member.energyPercentage}
-    });
-  }
-  return jarray;
-}
-
 void Player::setBodyDirectives(String const& directives)
 { m_identity.bodyDirectives = directives; updateIdentity(); }
 
-- 
cgit v1.2.3