Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-20 04:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/settings

Browse Source
This commit is contained in:
slawkens
2023-07-08 19:16:22 +02:00
parent 250d89482e a61cd43c3c
commit c886384f2c
160 changed files with 2668 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/libs/CreateCharacter.php
View File

@@ -138,7 +138,7 @@ class CreateCharacter
if(empty($errors))
{
$number_of_players_on_account = $account->getPlayersList(false)->count();
$number_of_players_on_account = $account->getPlayersList(true)->count();
if($number_of_players_on_account >= config('characters_per_account'))
$errors[] = 'You have too many characters on your account <b>('.$number_of_players_on_account.'/'.config('characters_per_account').')</b>!';
}

1
system/libs/data.php
View File

@@ -41,4 +41,3 @@ class Data
return $db->update($this->table, $data, $where);
}
}
?>

2
system/libs/pot/E_OTS_ErrorCode.php
View File

@@ -32,5 +32,3 @@ class E_OTS_ErrorCode extends Exception
}
/**#@-*/
?>

2
system/libs/pot/E_OTS_Generic.php
View File

@@ -36,5 +36,3 @@ class E_OTS_Generic extends E_OTS_ErrorCode
}
/**#@-*/
?>

2
system/libs/pot/E_OTS_NotAContainer.php
View File

@@ -22,5 +22,3 @@ class E_OTS_NotAContainer extends Exception
}
/**#@-*/
?>

2
system/libs/pot/E_OTS_OTBMError.php
View File

@@ -32,5 +32,3 @@ class E_OTS_OTBMError extends E_OTS_ErrorCode
}
/**#@-*/
?>

2
system/libs/pot/E_OTS_ReadOnly.php
View File

@@ -22,5 +22,3 @@ class E_OTS_ReadOnly extends Exception
}
/**#@-*/
?>

2
system/libs/pot/IOTS_Cipher.php
View File

@@ -37,5 +37,3 @@ interface IOTS_Cipher
}
/**#@-*/
?>

2
system/libs/pot/IOTS_DataDisplay.php
View File

@@ -89,5 +89,3 @@ interface IOTS_DataDisplay
}
/**#@-*/
?>

2
system/libs/pot/IOTS_Display.php
View File

@@ -96,5 +96,3 @@ interface IOTS_Display
}
/**#@-*/
?>

2
system/libs/pot/IOTS_GuildAction.php
View File

@@ -67,5 +67,3 @@ interface IOTS_GuildAction
}
/**#@-*/
?>

4
system/libs/pot/OTS_Account.php
View File

@@ -994,7 +994,7 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
$access = 0;
// finds ranks of all characters
foreach($this->getPlayersList() as $player)
foreach($this->getPlayersList(false) as $player)
{
$rank = $player->getRank();
@@ -1198,5 +1198,3 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
}
/**#@-*/
?>

2
system/libs/pot/OTS_AccountBans_List.php
View File

@@ -34,5 +34,3 @@ class OTS_AccountBans_List extends OTS_Bans_List
$this->setFilter($filter);
}
}
?>

2
system/libs/pot/OTS_Admin.php
View File

@@ -735,5 +735,3 @@ class OTS_Admin
}
/**#@-*/
?>

2
system/libs/pot/OTS_Bans_List.php
View File

@@ -100,5 +100,3 @@ class OTS_Bans_List extends OTS_Base_List
}
}
}
?>

2
system/libs/pot/OTS_Base_DB.php
View File

@@ -265,5 +265,3 @@ abstract class OTS_Base_DB extends PDO implements IOTS_DB
}
/**#@-*/
?>

2
system/libs/pot/OTS_BinaryTools.php
View File

@@ -146,5 +146,3 @@ class OTS_BinaryTools
}
/**#@-*/
?>

2
system/libs/pot/OTS_Container.php
View File

@@ -149,5 +149,3 @@ class OTS_Container extends OTS_Item implements IteratorAggregate
}
/**#@-*/
?>

2
system/libs/pot/OTS_FileLoader.php
View File

@@ -357,5 +357,3 @@ class OTS_FileLoader
}
/**#@-*/
?>

2
system/libs/pot/OTS_Group.php
View File

@@ -671,5 +671,3 @@ class OTS_Group extends OTS_Row_DAO implements IteratorAggregate, Countable
}
/**#@-*/
?>

2
system/libs/pot/OTS_Guild.php
View File

@@ -837,5 +837,3 @@ class OTS_Guild extends OTS_Row_DAO implements IteratorAggregate, Countable
}
/**#@-*/
?>

2
system/libs/pot/OTS_GuildRanks_List.php
View File

@@ -72,5 +72,3 @@ class OTS_GuildRanks_List extends OTS_Base_List
}
/**#@-*/
?>

2
system/libs/pot/OTS_House.php
View File

@@ -529,5 +529,3 @@ class OTS_House extends OTS_Row_DAO
}
/**#@-*/
?>

2
system/libs/pot/OTS_IPBans_List.php
View File

@@ -34,5 +34,3 @@ class OTS_IPBans_List extends OTS_Bans_List
$this->setFilter($filter);
}
}
?>

2
system/libs/pot/OTS_InfoRespond.php
View File

@@ -387,5 +387,3 @@ class OTS_InfoRespond extends DOMDocument
}
/**#@-*/
?>

2
system/libs/pot/OTS_ItemsList.php
View File

@@ -676,5 +676,3 @@ class OTS_ItemsList extends OTS_FileLoader implements IteratorAggregate, Countab
}
/**#@-*/
?>

2
system/libs/pot/OTS_MapCoords.php
View File

@@ -130,5 +130,3 @@ class OTS_MapCoords
}
/**#@-*/
?>

2
system/libs/pot/OTS_MonstersList.php
View File

@@ -299,5 +299,3 @@ class OTS_MonstersList implements Iterator, Countable, ArrayAccess
}
/**#@-*/
?>

2
system/libs/pot/OTS_Player.php
View File

@@ -3627,5 +3627,3 @@ class OTS_Player extends OTS_Row_DAO
}
/**#@-*/
?>

2
system/libs/pot/OTS_PlayerBans_List.php
View File

@@ -34,5 +34,3 @@ class OTS_PlayerBans_List extends OTS_Bans_List
$this->setFilter($filter);
}
}
?>

2
system/libs/pot/OTS_Row_DAO.php
View File

@@ -75,5 +75,3 @@ abstract class OTS_Row_DAO extends OTS_Base_DAO
}
/**#@-*/
?>

2
system/libs/pot/OTS_SQLField.php
View File

@@ -121,5 +121,3 @@ class OTS_SQLField
}
/**#@-*/
?>

2
system/libs/pot/OTS_ServerInfo.php
View File

@@ -227,5 +227,3 @@ class OTS_ServerInfo
}
/**#@-*/
?>

2
system/libs/pot/OTS_Spell.php
View File

@@ -482,5 +482,3 @@ class OTS_Spell
}
/**#@-*/
?>

2
system/libs/pot/OTS_Toolbox.php
View File

@@ -113,5 +113,3 @@ class OTS_Toolbox
}
/**#@-*/
?>

2
system/libs/pot/OTS_XTEA.php
View File

@@ -151,5 +151,3 @@ class OTS_XTEA implements IOTS_Cipher
}
/**#@-*/
?>

1
system/libs/rfc6238.php
View File

@@ -282,4 +282,3 @@ class TokenAuth6238 {
return $result;
}
}
?>

1
system/libs/validator.php
View File

@@ -451,4 +451,3 @@ class Validator
return self::$lastError;
}
}
?>