oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

CSM: Fix duplicate player names (#13910)

Browse source
This commit is contained in:
SmallJoker 2023-10-22 15:31:29 +02:00 • committed by GitHub
parent 3491509b21
commit 2fbf5f4250
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/client.h
View file

@ -288,7 +288,7 @@ public:
// Send the item number 'item' as player item to the server
void setPlayerItem(u16 item);
const std::list<std::string> &getConnectedPlayerNames()
const std::set<std::string> &getConnectedPlayerNames()
{
return m_env.getPlayerNames();
}

15
src/client/clientenvironment.h
View file

@ -20,10 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once
#include "environment.h"
#include <ISceneManager.h>
#include "clientobject.h"
#include "util/numeric.h"
#include "activeobjectmgr.h"
#include "util/numeric.h" // IntervalLimiter
#include "activeobjectmgr.h" // client::ActiveObjectMgr
#include <set>
class ClientSimpleObject;
class ClientMap;
@ -135,9 +134,9 @@ public:
std::vector<PointedThing> &objects
);
const std::list<std::string> &getPlayerNames() { return m_player_names; }
void addPlayerName(const std::string &name) { m_player_names.push_back(name); }
void removePlayerName(const std::string &name) { m_player_names.remove(name); }
const std::set<std::string> &getPlayerNames() { return m_player_names; }
void addPlayerName(const std::string &name) { m_player_names.insert(name); }
void removePlayerName(const std::string &name) { m_player_names.erase(name); }
void updateCameraOffset(const v3s16 &camera_offset)
{ m_camera_offset = camera_offset; }
v3s16 getCameraOffset() const { return m_camera_offset; }
@ -156,7 +155,7 @@ private:
std::vector<ClientSimpleObject*> m_simple_objects;
std::queue<ClientEnvEvent> m_client_event_queue;
IntervalLimiter m_active_object_light_update_interval;
std::list<std::string> m_player_names;
std::set<std::string> m_player_names;
v3s16 m_camera_offset;
u64 m_frame_time = 0;
u64 m_frame_dtime = 0;