From 93a17602631e9d855603edaf3fe96a4e828740ea Mon Sep 17 00:00:00 2001 From: slawkens Date: Tue, 16 Feb 2021 02:18:13 +0100 Subject: [PATCH] Patch "Delete char with house" from develop Co-Authored-By: Lee <42119604+Leesneaks@users.noreply.github.com> --- system/pages/account/delete_character.php | 33 ++++++++++++++--------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/system/pages/account/delete_character.php b/system/pages/account/delete_character.php index 0dd9b3b4..3ee0eb76 100644 --- a/system/pages/account/delete_character.php +++ b/system/pages/account/delete_character.php @@ -24,18 +24,27 @@ if(isset($_POST['deletecharactersave']) && $_POST['deletecharactersave'] == 1) { if($password_verify == $account_logged->getPassword()) { if(!$player->isOnline()) { if(!$player->isDeleted()) { - //dont show table "delete character" again - $show_form = false; - //delete player - if ($db->hasColumn('players', 'deletion')) - $player->setCustomField('deletion', 1); - else - $player->setCustomField('deleted', 1); - $account_logged->logAction('Deleted character ' . $player->getName() . '.'); - $twig->display('success.html.twig', array( - 'title' => 'Character Deleted', - 'description' => 'The character ' . $player_name . ' has been deleted.' - )); + if(fieldExist('id', 'houses')) { + $house = $db->query('SELECT `id` FROM `houses` WHERE `owner` = '.$player->getId()); + if($house->rowCount() > 0) { + $errors[] = 'You cannot delete a character when they own a home.'; + } + } + + if(empty($errors)) { + //dont show table "delete character" again + $show_form = false; + //delete player + if ($db->hasColumn('players', 'deletion')) + $player->setCustomField('deletion', 1); + else + $player->setCustomField('deleted', 1); + $account_logged->logAction('Deleted character ' . $player->getName() . '.'); + $twig->display('success.html.twig', array( + 'title' => 'Character Deleted', + 'description' => 'The character ' . $player_name . ' has been deleted.' + )); + } } else { $errors[] = 'This player has been already deleted.';