Make the reconnect code only trigger when there's actually a client IN ZONE and try to clean up otherwise

world/cliententry.cpp

@@ -121,6 +121,8 @@ void ClientListEntry::SetOnline(ZoneServer* iZS, int8 iOnline) {
 }
 
 void ClientListEntry::SetOnline(int8 iOnline) {
+	Log(Logs::Detail, Logs::World_Server, "ClientListEntry::SetOnline for %s(%i) = %i", AccountName(), AccountID(), iOnline);
+
 	if (iOnline >= CLE_Status_Online && pOnline < CLE_Status_Online)
 		numplayers++;
 	else if (iOnline < CLE_Status_Online && pOnline >= CLE_Status_Online) {

world/clientlist.cpp

@@ -64,8 +64,6 @@ void ClientList::Process() {
 			struct in_addr in;
 			in.s_addr = iterator.GetData()->GetIP();
 			Log(Logs::Detail, Logs::World_Server,"Removing client from %s:%d", inet_ntoa(in), iterator.GetData()->GetPort());
-//the client destructor should take care of this.
-//			iterator.GetData()->Free();
 			iterator.RemoveCurrent();
 		}
 		else

world/login_server.cpp

@@ -109,14 +109,14 @@ void LoginServer::ProcessUsertoWorldReq(uint16_t opcode, EQ::Net::Packet &p) {
 		auto cle = client_list.FindCLEByLSID(utwr->lsaccountid);
 		if (cle != nullptr) {
 			auto status = cle->GetOnline();
-			if (CLE_Status_Zoning == status || CLE_Status_InZone == status) {
+			if (CLE_Status_InZone == status) {
 				utwrs->response = UserToWorldStatusAlreadyOnline;
 				SendPacket(&outpack);
 				return;
 			}
 			else {
-				//our existing cle is in a state we can login to, mark the old as stale and remove it.
-				client_list.RemoveCLEByLSID(utwr->lsaccountid);
+				zoneserver_list.DropClient(utwrs->lsaccountid);
+				client_list.RemoveCLEByLSID(utwrs->lsaccountid);
 			}
 		}
 	}

world/zonelist.cpp

@@ -708,6 +708,13 @@ void ZSList::WorldShutDown(uint32 time, uint32 interval)
 	}
 }
 
+void ZSList::DropClient(uint32 lsid) {
+	ServerPacket packet(ServerOP_DropClient, sizeof(ServerZoneDropClient_Struct));
+	auto drop = (ServerZoneDropClient_Struct*)packet.pBuffer;
+	drop->lsid = lsid;
+	SendPacket(&packet);
+}
+
 void ZSList::OnTick(EQ::Timer *t)
 {
 	if (!EventSubscriptionWatcher::Get()->IsSubscribed("EQW::ZoneUpdate")) {

world/zonelist.h

@@ -57,6 +57,7 @@ public:
 	void SOPZoneBootup(const char *adminname, uint32 ZoneServerID, const char *zonename, bool iMakeStatic = false);
 	void UpdateUCSServerAvailable(bool ucss_available = true);
 	void WorldShutDown(uint32 time, uint32 interval);
+	void DropClient(uint32 lsid);
 
 	ZoneServer*	FindByPort(uint16 port);
 	ZoneServer* FindByID(uint32 ZoneID);

world/zoneserver.cpp

@@ -1457,6 +1457,7 @@ void ZoneServer::IncomingClient(Client* client) {
 	s->accid = client->GetAccountID();
 	s->admin = client->GetAdmin();
 	s->charid = client->GetCharID();
+	s->lsid = client->GetLSID();
 	if (client->GetCLE())
 		s->tellsoff = client->GetCLE()->TellsOff();
 	strn0cpy(s->charname, client->GetCharName(), sizeof(s->charname));