From 48f63eda9029d4fe16b7a350059c8e26ba8484ce Mon Sep 17 00:00:00 2001 From: Ovah Date: Sat, 24 Jul 2021 14:49:21 +0200 Subject: Core/Spawns: prevent spawn groups from bypassing spawnMask restrictions (#26711) * spawn groups have been able to spawn for all difficulties even when they should be restricted to a single difficulty only --- src/server/game/Maps/Map.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index d5b64275ffd..b18020b6e67 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3408,6 +3408,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 & (1 << GetSpawnMode()))) + continue; + // don't spawn if the grid isn't loaded (will be handled in grid loader) if (!IsGridLoaded(data->spawnPoint)) continue; -- cgit v1.2.3