From d35af4ef6c07880c077740609623df70941a3dba Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 25 Nov 2020 10:14:17 +0100 Subject: [PATCH] Core/Maps: fixed spawn groups bypassing spawnMask restrictions when tied to boss encounters --- src/server/game/Maps/Map.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 64c72dfc93..39c772bbd5 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3474,6 +3474,10 @@ bool Map::SpawnGroupSpawn(uint32 groupId, bool ignoreRespawn, bool force, std::v for (SpawnData const* data : toSpawn) { + // don't spawn if the current map difficulty is not used by the spawn + if (!(data->spawnMask & GetSpawnMode())) + continue; + // don't spawn if the grid isn't loaded (will be handled in grid loader) if (!IsGridLoaded(data->spawnPoint)) continue;