diff options
Diffstat (limited to 'game/server')
| -rw-r--r-- | game/server/chat.cc | 3 | ||||
| -rw-r--r-- | game/server/receive.cc | 3 | ||||
| -rw-r--r-- | game/server/sessions.cc | 15 | ||||
| -rw-r--r-- | game/server/whitelist.cc | 3 | ||||
| -rw-r--r-- | game/server/world/overworld.cc | 6 |
5 files changed, 20 insertions, 10 deletions
diff --git a/game/server/chat.cc b/game/server/chat.cc index 1634c59..b7826b0 100644 --- a/game/server/chat.cc +++ b/game/server/chat.cc @@ -11,7 +11,8 @@ static void on_chat_message_packet(const protocol::ChatMessage& packet) if(packet.type == protocol::ChatMessage::TEXT_MESSAGE) { if(auto session = sessions::find(packet.peer)) { server_chat::broadcast(packet.message.c_str(), session->client_username.c_str()); - } else { + } + else { server_chat::broadcast(packet.message.c_str(), packet.sender.c_str()); } } diff --git a/game/server/receive.cc b/game/server/receive.cc index 1945243..296d664 100644 --- a/game/server/receive.cc +++ b/game/server/receive.cc @@ -135,7 +135,8 @@ static void on_request_chunk_packet(const protocol::RequestChunk& packet) response.chunk = packet.cpos; response.voxels = chunk->get_voxels(); protocol::send(packet.peer, protocol::encode(response)); - } else { + } + else { world::worldgen::request_chunk(session, packet.cpos); } } diff --git a/game/server/sessions.cc b/game/server/sessions.cc index df98c75..7ca0d7c 100644 --- a/game/server/sessions.cc +++ b/game/server/sessions.cc @@ -99,7 +99,8 @@ static void on_login_request_packet(const protocol::LoginRequest& packet) protocol::send(packet.peer, protocol::encode(response)); return; } - } else if(packet.password_hash != server_game::password_hash) { + } + else if(packet.password_hash != server_game::password_hash) { protocol::Disconnect response; response.reason = "protocol.password_incorrect"; protocol::send(packet.peer, protocol::encode(response)); @@ -327,7 +328,8 @@ Session* sessions::find(const char* client_username) const auto it = username_map.find(client_username); if(it != username_map.cend()) { return it->second; - } else { + } + else { return nullptr; } } @@ -337,7 +339,8 @@ Session* sessions::find(std::uint16_t client_index) if(client_index < sessions_vector.size()) { if(!sessions_vector[client_index].peer) { return nullptr; - } else { + } + else { return &sessions_vector[client_index]; } } @@ -351,7 +354,8 @@ Session* sessions::find(std::uint64_t client_identity) if(it != identity_map.cend()) { return it->second; - } else { + } + else { return nullptr; } } @@ -360,7 +364,8 @@ Session* sessions::find(ENetPeer* peer) { if(peer != nullptr) { return reinterpret_cast<Session*>(peer->data); - } else { + } + else { return nullptr; } } diff --git a/game/server/whitelist.cc b/game/server/whitelist.cc index 2da1bf4..8a858c6 100644 --- a/game/server/whitelist.cc +++ b/game/server/whitelist.cc @@ -64,7 +64,8 @@ void whitelist::init_late(void) // to the global server password; this allows easier adding // of guest accounts which can later be edited to use a better password whitelist_map[line] = server_game::password_hash; - } else { + } + else { const auto username = line.substr(0, location); const auto password = line.substr(location + 1); whitelist_map[username] = math::crc64(password); diff --git a/game/server/world/overworld.cc b/game/server/world/overworld.cc index 3949b77..ff0b6f7 100644 --- a/game/server/world/overworld.cc +++ b/game/server/world/overworld.cc @@ -296,7 +296,8 @@ void world::Overworld::generate_surface(const chunk_pos& cpos, VoxelStorage& vox } depth += 1U; - } else { + } + else { if(voxels[d_index] == NULL_VOXEL_ID) { break; } @@ -308,7 +309,8 @@ void world::Overworld::generate_surface(const chunk_pos& cpos, VoxelStorage& vox if(depth < 5U) { if(depth == 0U) { voxels[i] = game_voxels::grass; - } else { + } + else { voxels[i] = game_voxels::dirt; } } |