Skip to content

improve: load player town and fix player badge escape string #3055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dudantas merged 2 commits into from
Nov 3, 2024
Merged

improve: load player town and fix player badge escape string #3055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d91ac57
improve: load player town and fix player badge escape string
dudantas Nov 2, 2024
31692ee
improve: to const ref
dudantas Nov 2, 2024
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
3 changes: 2 additions & 1 deletion src/creatures/players/cyclopedia/player_badge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ std::vector<std::shared_ptr<Player>> PlayerBadge::getPlayersInfoByAccount(const
if (!namesList.empty()) {
namesList += ", ";
}
namesList += fmt::format("'{}'", name);
std::string escapedName = g_database().escapeString(name);
namesList += fmt::format("{}", escapedName);
}

auto query = fmt::format("SELECT name, level, vocation FROM players WHERE name IN ({})", namesList);
Expand Down
24 changes: 21 additions & 3 deletions src/io/functions/iologindata_load_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,28 @@ bool IOLoginDataLoad::loadPlayerBasicInfo(const std::shared_ptr<Player> &player,
player->setOfflineTrainingSkill(skill);
const auto &town = g_game().map.towns.getTown(result->getNumber<uint32_t>("town_id"));
if (!town) {
g_logger().error("Player {} has town id {} which doesn't exist", player->name, result->getNumber<uint16_t>("town_id"));
return false;
g_logger().error("Player {} has invalid town id {}. Attempting to set the correct town.", player->name, result->getNumber<uint16_t>("town_id"));

const auto &thaisTown = g_game().map.towns.getTown("Thais");
if (thaisTown) {
player->town = thaisTown;
g_logger().warn("Assigned town 'Thais' to player {}", player->name);
} else {
for (const auto &[townId, currentTown] : g_game().map.towns.getTowns()) {
if (townId != 0 && currentTown) {
player->town = currentTown;
g_logger().warn("Assigned first valid town {} (id: {}) to player {}", currentTown->getName(), townId, player->name);
}
}

if (!player->town) {
g_logger().error("Player {} has invalid town id {}. No valid town found to assign.", player->name, result->getNumber<uint16_t>("town_id"));
return false;
}
}
} else {
player->town = town;
}
player->town = town;

const Position &loginPos = player->loginPosition;
if (loginPos.x == 0 && loginPos.y == 0 && loginPos.z == 0) {
Expand Down