From 0ad05b0fe808eb383a433480dfcd721ceac7eec9 Mon Sep 17 00:00:00 2001 From: SFENCE Date: Thu, 28 Dec 2023 21:13:57 +0100 Subject: [PATCH] Fix C formating. Remove added method, which is not necessary. --- src/server.cpp | 4 ---- src/server.h | 1 - src/server/player_sao.cpp | 6 +++--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 9bc32fb7d0aee..e19467a97bc3c 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -3420,10 +3420,6 @@ Address Server::getPeerAddress(session_t peer_id) // Note that this is only set after Init was received in Server::handleCommand_Init return getClient(peer_id, CS_Invalid)->getAddress(); } -u16 Server::getPeerProtocolVersion(session_t peer_id) -{ - return m_clients.getProtocolVersion(peer_id); -} void Server::setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4], f32 frame_speed) diff --git a/src/server.h b/src/server.h index ab8c87bac582b..bec2fe1cfdc04 100644 --- a/src/server.h +++ b/src/server.h @@ -326,7 +326,6 @@ class Server : public con::PeerHandler, public MapEventReceiver, void hudSetHotbarSelectedImage(RemotePlayer *player, const std::string &name); Address getPeerAddress(session_t peer_id); - u16 getPeerProtocolVersion(session_t peer_id); void setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4], f32 frame_speed); diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp index 37cd0a552258e..12a0bbd0aa6cd 100644 --- a/src/server/player_sao.cpp +++ b/src/server/player_sao.cpp @@ -370,8 +370,8 @@ void PlayerSAO::setPos(const v3f &pos) void PlayerSAO::addPos(const v3f &added_pos) { // Backward compatibility for older clients - if (m_env->getGameDef()->getPeerProtocolVersion(m_peer_id) < 44) { - setPos(getBasePosition()+added_pos); + if (m_player->protocol_version < 44) { + setPos(getBasePosition() + added_pos); return; } @@ -379,7 +379,7 @@ void PlayerSAO::addPos(const v3f &added_pos) return; // Send mapblock of target location - v3f pos = getBasePosition()+added_pos; + v3f pos = getBasePosition() + added_pos; v3s16 blockpos = v3s16(pos.X / MAP_BLOCKSIZE, pos.Y / MAP_BLOCKSIZE, pos.Z / MAP_BLOCKSIZE); m_env->getGameDef()->SendBlock(m_peer_id, blockpos);