From 50d989d767f757090e805f4adb2bc4e2a5c890fd Mon Sep 17 00:00:00 2001 From: Koncord Date: Sat, 8 Oct 2016 15:30:52 +0800 Subject: [PATCH] Fix server crash if player is not fully connected --- apps/openmw-mp/Networking.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp index 76df2b304..674b127ef 100644 --- a/apps/openmw-mp/Networking.cpp +++ b/apps/openmw-mp/Networking.cpp @@ -405,8 +405,11 @@ void Networking::NewPlayer(RakNet::RakNetGUID guid) void Networking::DisconnectPlayer(RakNet::RakNetGUID guid) { - Script::Call(Players::GetPlayer(guid)->GetID()); - controller->GetPacket(ID_USER_DISCONNECTED)->Send(Players::GetPlayer(guid), true); + Player *player = Players::GetPlayer(guid); + if(!player) + return; + Script::Call(player->GetID()); + controller->GetPacket(ID_USER_DISCONNECTED)->Send(player, true); Players::DeletePlayer(guid); }