diff --git a/admin/pages/players.php b/admin/pages/players.php index ddf349f4..c0be81f4 100644 --- a/admin/pages/players.php +++ b/admin/pages/players.php @@ -35,6 +35,7 @@ $skills = array( $hasBlessingsColumn = $db->hasColumn('players', 'blessings'); $hasBlessingColumn = $db->hasColumn('players', 'blessings1'); $hasLookAddons = $db->hasColumn('players', 'lookaddons'); +$hasCapColumn = $db->hasColumn('players', 'cap'); $skull_type = array("None", "Yellow", "Green", "White", "Red", "Black", "Orange"); ?> @@ -167,8 +168,11 @@ else if (isset($_REQUEST['search'])) { $town = $_POST['town']; verify_number($town, 'Town', 11); - $capacity = $_POST['capacity']; - verify_number($capacity, 'Capacity', 11); + if ($hasCapColumn) { + $capacity = $_POST['capacity']; + verify_number($capacity, 'Capacity', 11); + } + $sex = $_POST['sex']; verify_number($sex, 'Sex', 1); @@ -282,7 +286,11 @@ else if (isset($_REQUEST['search'])) { $player->setPosZ($pos_z); $player->setSoul($soul); $player->setTownId($town); - $player->setCap($capacity); + + if ($hasCapColumn) { + $player->setCap($capacity); + } + $player->setSex($sex); $player->setLastLogin($lastlogin); $player->setLastLogout($lastlogout); @@ -561,10 +569,12 @@ else if (isset($_REQUEST['search'])) {
+
+
diff --git a/system/libs/pot/OTS_Player.php b/system/libs/pot/OTS_Player.php index c3f56e5a..457a4138 100644 --- a/system/libs/pot/OTS_Player.php +++ b/system/libs/pot/OTS_Player.php @@ -1390,12 +1390,7 @@ class OTS_Player extends OTS_Row_DAO */ public function getCap() { - if( !isset($this->data['cap']) ) - { - throw new E_OTS_NotLoaded(); - } - - return $this->data['cap']; + return $this->data['cap'] ?? 0; } /** diff --git a/system/src/CreateCharacter.php b/system/src/CreateCharacter.php index 594eda9d..86a81696 100644 --- a/system/src/CreateCharacter.php +++ b/system/src/CreateCharacter.php @@ -149,7 +149,10 @@ class CreateCharacter if($db->hasColumn('players', 'direction')) $player->setDirection($playerSample->getDirection()); - $player->setConditions($playerSample->getConditions()); + if($db->hasColumn('players', 'conditions')) { + $player->setConditions($playerSample->getConditions()); + } + $rank = $playerSample->getRank(); if($rank->isLoaded()) { $player->setRank($playerSample->getRank()); @@ -183,7 +186,11 @@ class CreateCharacter $player->setLookHead($playerSample->getLookHead()); $player->setLookLegs($playerSample->getLookLegs()); $player->setLookType($playerSample->getLookType()); - $player->setCap($playerSample->getCap()); + + if($db->hasColumn('players', 'cap')) { + $player->setCap($playerSample->getCap()); + } + $player->setBalance(0); $player->setPosX(0); $player->setPosY(0);