Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-14 01:34:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/login-by-email

Browse Source
This commit is contained in:
slawkens
2022-05-31 12:25:26 +02:00
parent 6d19d69d20 6acbbe3fa1
commit 2563583f84
32 changed files with 965 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
system/pages/account/change_name.php
View File

@@ -52,6 +52,29 @@ else
$old_name = $player->getName();
$player->setName($name);
$player->save();
if ($db->hasTable('player_deaths') &&
$db->hasColumn('player_deaths', 'mostdamage_is_player') &&
$db->hasColumn('player_deaths', 'killed_by')) {
$namesToChange = $db->query('SELECT `player_id`, `time`, `is_player`, `killed_by`, `mostdamage_is_player`, `mostdamage_by` FROM `player_deaths` WHERE (`is_player` = 1 AND `killed_by` = ' . $db->quote($old_name) . ') OR (`mostdamage_is_player` = 1 AND `mostdamage_by` = ' . $db->quote($old_name) . ');');
if ($namesToChange->rowCount() > 0) {
foreach ($namesToChange->fetchAll(PDO::FETCH_ASSOC) as $row) {
$changeKey = '';
if ($row['is_player'] == '1' && $row['killed_by'] == $old_name) {
$changeKey = 'killed_by';
} else if ($row['mostdamage_is_player'] == '1' && $row['mostdamage_by'] == $old_name) {
$changeKey = 'mostdamage_by';
}
if (!empty($changeKey)) {
$db->update('player_deaths', [$changeKey => $name], ['player_id' => $row['player_id'], 'time' => $row['time']]);
}
}
}
}
$account_logged->setCustomField("premium_points", $points - $config['account_change_character_name_points']);
$account_logged->logAction('Changed name from <b>' . $old_name . '</b> to <b>' . $player->getName() . '</b>.');
$twig->display('success.html.twig', array(
@@ -83,4 +106,4 @@ else
}
}
?>
?>

2
system/pages/guilds/change_rank.php
View File

@@ -86,7 +86,7 @@ if($guild_vice)
else
{
$player_in_guild = false;
if($guild->getName() === $player_to_change->getRank()->getGuild()->getName() || $guild_leader)
if($guild->getName() === $player_to_change->getRank()->getGuild()->getName())
{
$player_in_guild = true;
$player_has_lower_rank = false;