From 811c9d4d5cec70bd18ea6af053d9bf4cd988013e Mon Sep 17 00:00:00 2001 From: dongresource Date: Tue, 8 Dec 2020 01:53:21 +0100 Subject: [PATCH] Stop iterating in exitDuplicate() after having removed a player This fixes a crash due to the invalidated iterator continuing to loop. It should be safe to assume there's only ever one duplicate/stale player. Also updated tdata. --- src/PlayerManager.cpp | 1 + tdata | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PlayerManager.cpp b/src/PlayerManager.cpp index deece88..081d887 100644 --- a/src/PlayerManager.cpp +++ b/src/PlayerManager.cpp @@ -918,6 +918,7 @@ void PlayerManager::exitDuplicate(int accountId) { sock->kill(); CNShardServer::_killConnection(sock); + break; } } } diff --git a/tdata b/tdata index b87422b..e9e03fd 160000 --- a/tdata +++ b/tdata @@ -1 +1 @@ -Subproject commit b87422bf98529d6dff818d1a284b5e7230a34bc6 +Subproject commit e9e03fd0f0ddc09a29db03cc68a5e5276712f2a7