diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h index b4f3ca41c..883ecefac 100644 --- a/common/net/daybreak_connection.h +++ b/common/net/daybreak_connection.h @@ -257,7 +257,7 @@ namespace EQ resend_delay_min = 150; resend_delay_max = 5000; connect_delay_ms = 500; - stale_connection_ms = 30000; + stale_connection_ms = 60000; connect_stale_ms = 5000; crc_length = 2; max_packet_size = 512; diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index a433705e6..26ef62b82 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -471,7 +471,7 @@ static void ProcessCommandIgnore(Client *c, std::string Ignoree) { Clientlist::Clientlist(int ChatPort) { EQStreamManagerInterfaceOptions chat_opts(ChatPort, false, false); chat_opts.opcode_size = 1; - chat_opts.daybreak_options.stale_connection_ms = 300000; + chat_opts.daybreak_options.stale_connection_ms = 600000; chat_opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS); chat_opts.daybreak_options.resend_delay_factor = RuleR(Network, ResendDelayFactor); chat_opts.daybreak_options.resend_delay_min = RuleI(Network, ResendDelayMinMS); diff --git a/utils/sql/git/required/2019_07_26_char_kick_events.sql b/utils/sql/git/required/2019_07_26_char_kick_events.sql deleted file mode 100644 index 0b5308be0..000000000 --- a/utils/sql/git/required/2019_07_26_char_kick_events.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE TABLE `character_kick_events` ( - `Id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `Name` VARCHAR(64) NOT NULL, - `Reason` TEXT NOT NULL, - `Created` TIMESTAMP NOT NULL DEFAULT '', - PRIMARY KEY (`Id`), - INDEX `Name` (`Name`), - INDEX `Created` (`Created`) -) -ENGINE=InnoDB -; diff --git a/zone/client.cpp b/zone/client.cpp index 60a6d1d8c..7e6baf180 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -2590,7 +2590,7 @@ void Client::SetPVP(bool toggle, bool message) { void Client::Kick(const std::string &reason) { client_state = CLIENT_KICKED; - database.CreateKickEvent(GetName(), reason); + Log(Logs::General, Logs::Client_Login, "Client [%s] kicked, reason [%s]", GetCleanName(), reason.c_str()); } void Client::WorldKick() { diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index acf619aba..e2825da5a 100755 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -3835,14 +3835,6 @@ void ZoneDatabase::UpdateItemRecastTimestamps(uint32 char_id, uint32 recast_type QueryDatabase(query); } -void ZoneDatabase::CreateKickEvent(const std::string &character_name, const std::string &reason) -{ - std::string query = - StringFormat("INSERT INTO character_kick_events (Name, Reason) VALUES ('%s', '%s')", character_name.c_str(), reason.c_str()); - - QueryDatabase(query); -} - void ZoneDatabase::LoadPetInfo(Client *client) { diff --git a/zone/zonedb.h b/zone/zonedb.h index 285166042..f2103715a 100644 --- a/zone/zonedb.h +++ b/zone/zonedb.h @@ -292,7 +292,6 @@ public: void SavePetInfo(Client *c); void RemoveTempFactions(Client *c); void UpdateItemRecastTimestamps(uint32 char_id, uint32 recast_type, uint32 timestamp); - void CreateKickEvent(const std::string &character_name, const std::string &reason); bool DeleteCharacterAAs(uint32 character_id); bool DeleteCharacterBandolier(uint32 character_id, uint32 band_id);