From 9699c18653b8ea43c5778be3aaf3dcd22b4441b5 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 29 Jan 2024 16:43:55 +0100 Subject: Core/Players: fixed a possible crash in SendInitialPacketsBeforeAddToMap when uninstanced maps don't have a valid MapDifficulty entry (cherry picked from commit 924efc89b2668d390bf768ccd936cc67e4a77f5d) --- src/server/game/Entities/Player/Player.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 682919a4308..2f08e55e074 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -23482,7 +23482,8 @@ void Player::SendInitialPacketsBeforeAddToMap() /// SMSG_WORLD_SERVER_INFO WorldPackets::Misc::WorldServerInfo worldServerInfo; - worldServerInfo.InstanceGroupSize = GetMap()->GetMapDifficulty()->MaxPlayers; + if (MapDifficultyEntry const* mapDifficulty = GetMap()->GetMapDifficulty()) + worldServerInfo.InstanceGroupSize = mapDifficulty->MaxPlayers; worldServerInfo.IsTournamentRealm = 0; /// @todo // worldServerInfo.RestrictedAccountMaxLevel; /// @todo // worldServerInfo.RestrictedAccountMaxMoney; /// @todo -- cgit v1.2.3