From 0fec74cbed06339130605b712fc0025742cd5d92 Mon Sep 17 00:00:00 2001 From: SFENCE Date: Mon, 9 Jun 2025 20:35:44 +0200 Subject: [PATCH] Revert "Apply review." (remove m_player_name from player_sao) This reverts commit 07bbe4f4547f367ca19deecce35df668e5639287. --- src/server/player_sao.cpp | 6 +----- src/server/player_sao.h | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp index 83fca7ae29..1334443a17 100644 --- a/src/server/player_sao.cpp +++ b/src/server/player_sao.cpp @@ -14,6 +14,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t p bool is_singleplayer): UnitSAO(env_, v3f(0,0,0)), m_player(player_), + m_player_name(player_->getName()), m_peer_id_initial(peer_id_), m_is_singleplayer(is_singleplayer) { @@ -407,11 +408,6 @@ void PlayerSAO::setPlayerYaw(const float yaw) UnitSAO::setRotation(rotation); } -std::string PlayerSAO::getGUID() -{ - return m_player->getName(); -} - void PlayerSAO::setFov(const float fov) { if (m_player && fov != m_fov) diff --git a/src/server/player_sao.h b/src/server/player_sao.h index 492971ce95..a75f2bd3cb 100644 --- a/src/server/player_sao.h +++ b/src/server/player_sao.h @@ -78,7 +78,7 @@ public: void addPos(const v3f &added_pos) override; void moveTo(v3f pos, bool continuous) override; void setPlayerYaw(const float yaw); - std::string getGUID() override; + std::string getGUID() override { return m_player_name; } // Data should not be sent at player initialization void setPlayerYawAndSend(const float yaw); void setLookPitch(const float pitch); @@ -183,6 +183,7 @@ private: std::string generateUpdatePhysicsOverrideCommand() const; RemotePlayer *m_player = nullptr; + std::string m_player_name; ///< used as GUID session_t m_peer_id_initial = 0; ///< only used to initialize RemotePlayer // Cheat prevention