Merge remote-tracking branch 'origin/master' into feature/eqemu-api-data-service-netstats-ws

This commit is contained in:
KimLS
2019-05-16 14:38:12 -07:00
30 changed files with 312 additions and 267 deletions
+2
View File
@@ -257,11 +257,13 @@ void ServerManager::DestroyServerByName(std::string l_name, std::string s_name,
while (iter != world_servers.end()) {
if ((*iter).get() == ignore) {
++iter;
continue;
}
if ((*iter)->GetLongName().compare(l_name) == 0 && (*iter)->GetShortName().compare(s_name) == 0) {
(*iter)->GetConnection()->Handle()->Disconnect();
iter = world_servers.erase(iter);
continue;
}
++iter;