Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in demos due to PU not being recorded (#1032)

Browse Source 
Added some guards due to bad demo files being shared by now
This commit is contained in:
Salanto 2024-08-03 11:39:29 +02:00 committed by GitHub
parent ac673099e0
commit 6a44e09f05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/packet_distribution.cpp
View File

@ -689,6 +689,11 @@ void AOApplication::server_packet_received(AOPacket packet)
PlayerRegister update{content.at(0).toInt(), PlayerRegister::REGISTER_TYPE(content.at(1).toInt())}; PlayerRegister update{content.at(0).toInt(), PlayerRegister::REGISTER_TYPE(content.at(1).toInt())};
w_courtroom->playerList()->registerPlayer(update); w_courtroom->playerList()->registerPlayer(update);
if (log_to_demo)
{
append_to_demofile(packet.toString(true));
}
} }
else if (header == "PU") else if (header == "PU")
{ {

12
src/widgets/playerlistwidget.cpp
View File

@ -139,6 +139,11 @@ void PlayerListWidget::filterPlayerList()
int area_id = m_player_map.value(ao_app->client_id).area_id; int area_id = m_player_map.value(ao_app->client_id).area_id;
for (QListWidgetItem *item : qAsConst(m_item_map)) for (QListWidgetItem *item : qAsConst(m_item_map))
{ {
if (!item)
{
qWarning() << "Trying to filter item that does not exist. This indicates either a broken server-implementation or a bad demo file.";
break;
}
item->setHidden(m_player_map[item->data(Qt::UserRole).toInt()].area_id != area_id); item->setHidden(m_player_map[item->data(Qt::UserRole).toInt()].area_id != area_id);
} }
} }
@ -147,6 +152,13 @@ void PlayerListWidget::updatePlayer(int playerId, bool updateIcon)
{ {
PlayerData &data = m_player_map[playerId]; PlayerData &data = m_player_map[playerId];
QListWidgetItem *item = m_item_map[playerId]; QListWidgetItem *item = m_item_map[playerId];
if (!item)
{
qWarning() << "No player at ID" << playerId << ". This might indicate a broker server implementation or a bad demo file.";
return;
}
item->setText(data.name.isEmpty() ? QObject::tr("Unnamed Player") : data.name); item->setText(data.name.isEmpty() ? QObject::tr("Unnamed Player") : data.name);
if (data.character.isEmpty()) if (data.character.isEmpty())
{ {