Fix C formating. Remove added method, which is not necessary.

luanti-org · Dec 28, 2023 · 0ad05b0 · 0ad05b0
1 parent ca60345
commit 0ad05b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
@@ -370,16 +370,16 @@ 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;
 	}
 
 	if(isAttached())
 		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);