From 7074f35e4ba831e358117842b99ee35b87f85ae5 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 15:58:20 +0700 Subject: shared_ptr -> std::shared_ptr This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today. --- Minecraft.Client/PlayerList.h | 56 +++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'Minecraft.Client/PlayerList.h') diff --git a/Minecraft.Client/PlayerList.h b/Minecraft.Client/PlayerList.h index 14bd6b2d..23b48f74 100644 --- a/Minecraft.Client/PlayerList.h +++ b/Minecraft.Client/PlayerList.h @@ -22,7 +22,7 @@ private: static const int SEND_PLAYER_INFO_INTERVAL = 20 * 10; // 4J - brought forward from 1.2.3 // public static Logger logger = Logger.getLogger("Minecraft"); public: - vector > players; + vector > players; private: MinecraftServer *server; @@ -51,60 +51,60 @@ private: int sendAllPlayerInfoIn; // 4J Added to maintain which players in which dimensions can receive all packet types - vector > receiveAllPlayers[3]; + vector > receiveAllPlayers[3]; private: - shared_ptr findAlivePlayerOnSystem(shared_ptr currentPlayer); + std::shared_ptr findAlivePlayerOnSystem(std::shared_ptr currentPlayer); public: - void removePlayerFromReceiving(shared_ptr player, bool usePlayerDimension = true, int dimension = 0); - void addPlayerToReceiving(shared_ptr player); - bool canReceiveAllPackets(shared_ptr player); + void removePlayerFromReceiving(std::shared_ptr player, bool usePlayerDimension = true, int dimension = 0); + void addPlayerToReceiving(std::shared_ptr player); + bool canReceiveAllPackets(std::shared_ptr player); public: PlayerList(MinecraftServer *server); ~PlayerList(); - void placeNewPlayer(Connection *connection, shared_ptr player, shared_ptr packet); + void placeNewPlayer(Connection *connection, std::shared_ptr player, std::shared_ptr packet); void setLevel(ServerLevelArray levels); - void changeDimension(shared_ptr player, ServerLevel *from); + void changeDimension(std::shared_ptr player, ServerLevel *from); int getMaxRange(); - bool load(shared_ptr player); // 4J Changed return val to bool to check if new player or loaded player + bool load(std::shared_ptr player); // 4J Changed return val to bool to check if new player or loaded player protected: - void save(shared_ptr player); + void save(std::shared_ptr player); public: - void validatePlayerSpawnPosition(shared_ptr player); // 4J Added - void add(shared_ptr player); - void move(shared_ptr player); - void remove(shared_ptr player); - shared_ptr getPlayerForLogin(PendingConnection *pendingConnection, const wstring& userName, PlayerUID xuid, PlayerUID OnlineXuid); - shared_ptr respawn(shared_ptr serverPlayer, int targetDimension, bool keepAllPlayerData); - void toggleDimension(shared_ptr player, int targetDimension); + void validatePlayerSpawnPosition(std::shared_ptr player); // 4J Added + void add(std::shared_ptr player); + void move(std::shared_ptr player); + void remove(std::shared_ptr player); + std::shared_ptr getPlayerForLogin(PendingConnection *pendingConnection, const wstring& userName, PlayerUID xuid, PlayerUID OnlineXuid); + std::shared_ptr respawn(std::shared_ptr serverPlayer, int targetDimension, bool keepAllPlayerData); + void toggleDimension(std::shared_ptr player, int targetDimension); void tick(); bool isTrackingTile(int x, int y, int z, int dimension); // 4J added void prioritiseTileChanges(int x, int y, int z, int dimension); // 4J added - void broadcastAll(shared_ptr packet); - void broadcastAll(shared_ptr packet, int dimension); + void broadcastAll(std::shared_ptr packet); + void broadcastAll(std::shared_ptr packet, int dimension); wstring getPlayerNames(); public: bool isWhiteListed(const wstring& name); bool isOp(const wstring& name); - bool isOp(shared_ptr player); // 4J Added - shared_ptr getPlayer(const wstring& name); - shared_ptr getPlayer(PlayerUID uid); + bool isOp(std::shared_ptr player); // 4J Added + std::shared_ptr getPlayer(const wstring& name); + std::shared_ptr getPlayer(PlayerUID uid); void sendMessage(const wstring& name, const wstring& message); - void broadcast(double x, double y, double z, double range, int dimension, shared_ptr packet); - void broadcast(shared_ptr except, double x, double y, double z, double range, int dimension, shared_ptr packet); + void broadcast(double x, double y, double z, double range, int dimension, std::shared_ptr packet); + void broadcast(std::shared_ptr except, double x, double y, double z, double range, int dimension, std::shared_ptr packet); void broadcastToAllOps(const wstring& message); - bool sendTo(const wstring& name, shared_ptr packet); + bool sendTo(const wstring& name, std::shared_ptr packet); // 4J Added ProgressListener *progressListener param and bDeleteGuestMaps param void saveAll(ProgressListener *progressListener, bool bDeleteGuestMaps = false); void whiteList(const wstring& playerName); void blackList(const wstring& playerName); // Set getWhiteList(); / 4J removed void reloadWhitelist(); - void sendLevelInfo(shared_ptr player, ServerLevel *level); - void sendAllPlayerInfo(shared_ptr player); + void sendLevelInfo(std::shared_ptr player, ServerLevel *level); + void sendAllPlayerInfo(std::shared_ptr player); int getPlayerCount(); int getPlayerCount(ServerLevel *level); // 4J Added int getMaxPlayers(); @@ -113,7 +113,7 @@ public: void setOverrideGameMode(GameType *gameMode); private: - void updatePlayerGameMode(shared_ptr newPlayer, shared_ptr oldPlayer, Level *level); + void updatePlayerGameMode(std::shared_ptr newPlayer, std::shared_ptr oldPlayer, Level *level); public: void setAllowCheatsForAllPlayers(bool allowCommands); -- cgit v1.2.3