pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-05 03:06:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:EQEmu/Server

Browse Source
This commit is contained in:
KimLS
2018-07-07 22:39:19 -07:00
parent 5060de9b58 41ab512349
commit b6388595f3
100 changed files with 4711 additions and 4552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/client.cpp
+4 -4
View File
@@ -212,8 +212,8 @@ void Client::SendMaxCharCreate() {
MaxCharacters_Struct* mc = (MaxCharacters_Struct*)outapp->pBuffer;
mc->max_chars = EQEmu::constants::Lookup(m_ClientVersion)->CharacterCreationLimit;
if (mc->max_chars > EQEmu::constants::CharacterCreationMax)
mc->max_chars = EQEmu::constants::CharacterCreationMax;
if (mc->max_chars > EQEmu::constants::CHARACTER_CREATION_LIMIT)
mc->max_chars = EQEmu::constants::CHARACTER_CREATION_LIMIT;
QueuePacket(outapp);
safe_delete(outapp);
@@ -766,8 +766,8 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) {
// (This is a literal translation of the original process..I don't see why it can't be changed to a single-target query over account iteration)
if (!is_player_zoning) {
size_t character_limit = EQEmu::constants::Lookup(eqs->ClientVersion())->CharacterCreationLimit;
if (character_limit > EQEmu::constants::CharacterCreationMax) { character_limit = EQEmu::constants::CharacterCreationMax; }
if (eqs->ClientVersion() == EQEmu::versions::ClientVersion::Titanium) { character_limit = 8; }
if (character_limit > EQEmu::constants::CHARACTER_CREATION_LIMIT) { character_limit = EQEmu::constants::CHARACTER_CREATION_LIMIT; }
if (eqs->ClientVersion() == EQEmu::versions::ClientVersion::Titanium) { character_limit = Titanium::constants::CHARACTER_CREATION_LIMIT; }
std::string tgh_query = StringFormat(
"SELECT "
world/net.cpp
+7 -2
View File
@@ -85,6 +85,7 @@ union semun {
#include "console.h"
#include "../common/net/servertalk_server.h"
#include "../zone/data_bucket.h"
ClientList client_list;
GroupLFPList LFPGroupList;
@@ -309,6 +310,9 @@ int main(int argc, char** argv) {
}
}
Log(Logs::General, Logs::World_Server, "Purging expired data buckets...");
database.PurgeAllDeletedDataBuckets();
Log(Logs::General, Logs::World_Server, "Loading zones..");
database.LoadZoneNames();
Log(Logs::General, Logs::World_Server, "Clearing groups..");
@@ -389,6 +393,7 @@ int main(int argc, char** argv) {
Log(Logs::General, Logs::World_Server, "Purging expired instances");
database.PurgeExpiredInstances();
Timer PurgeInstanceTimer(450000);
PurgeInstanceTimer.Start(450000);
@@ -545,9 +550,9 @@ int main(int argc, char** argv) {
client_list.Process();
if (PurgeInstanceTimer.Check())
{
if (PurgeInstanceTimer.Check()) {
database.PurgeExpiredInstances();
database.PurgeAllDeletedDataBuckets();
}
if (EQTimeTimer.Check()) {
world/worlddb.cpp
+2 -2
View File
@@ -39,8 +39,8 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
size_t character_limit = EQEmu::constants::Lookup(client_version)->CharacterCreationLimit;
// Validate against absolute server max
if (character_limit > EQEmu::constants::CharacterCreationMax)
character_limit = EQEmu::constants::CharacterCreationMax;
if (character_limit > EQEmu::constants::CHARACTER_CREATION_LIMIT)
character_limit = EQEmu::constants::CHARACTER_CREATION_LIMIT;
// Force Titanium clients to use '8'
if (client_version == EQEmu::versions::ClientVersion::Titanium)