Apply review.

luanti-org · Dec 29, 2023 · d2978dc · d2978dc
1 parent 52e5089
commit d2978dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
@@ -642,7 +642,7 @@ void Client::handleCommand_MovePlayerRel(NetworkPacket *pkt)
 	*pkt >> added_pos;
 
 	LocalPlayer *player = m_env.getLocalPlayer();
-	assert(player != NULL);
+	assert(player);
 	player->addPosition(added_pos);
 }
 

diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp
@@ -369,15 +369,15 @@ void PlayerSAO::setPos(const v3f &pos)
 
 void PlayerSAO::addPos(const v3f &added_pos)
 {
+	if (isAttached())
+		return;
+
 	// Backward compatibility for older clients
 	if (m_player->protocol_version < 44) {
 		setPos(getBasePosition() + added_pos);
 		return;
 	}
 
-	if (isAttached())
-		return;
-
 	// Send mapblock of target location
 	v3f pos = getBasePosition() + added_pos;
 	v3s16 blockpos = v3s16(pos.X / MAP_BLOCKSIZE, pos.Y / MAP_BLOCKSIZE, pos.Z / MAP_BLOCKSIZE);