Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/packet/packet_rd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,6 @@ void PacketRD::handlePacket(AreaData *area, AOClient &client) const
}
emit client.joined();
area->addClient(-1, client.clientId());
client.getServer()->getPlayerStateObserver()->registerClient(&client);
client.arup(client.ARUPType::PLAYER_COUNT, true); // Tell everyone there is a new player
}
6 changes: 5 additions & 1 deletion src/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ void Server::clientConnected()
int user_id = m_available_ids.pop();
AOClient *client = new AOClient(this, l_socket, l_socket, user_id, music_manager);
m_clients_ids.insert(user_id, client);
m_player_state_observer.registerClient(client);

int multiclient_count = 1;
bool is_at_multiclient_limit = false;
Expand Down Expand Up @@ -277,6 +276,11 @@ QHostAddress Server::parseToIPv4(QHostAddress f_remote_ip)
return l_remote_ip;
}

PlayerStateObserver *Server::getPlayerStateObserver()
{
return &m_player_state_observer;
}

void Server::reloadSettings()
{
ConfigManager::reloadSettings();
Expand Down
5 changes: 5 additions & 0 deletions src/server.h
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,11 @@ class Server : public QObject
*/
QHostAddress parseToIPv4(QHostAddress f_remote_ip);

/**
* @brief Returns a raw-pointer of the curr
*/
PlayerStateObserver *getPlayerStateObserver();

public slots:
/**
* @brief Convenience class to call a reload of available configuraiton elements.
Expand Down