diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-07-07 19:18:32 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2019-07-07 19:18:32 +0200 |
| commit | ded18a2690063991d5440df7d3e5d526b884ec16 (patch) | |
| tree | 1ffecda28f1266fb088a6d5e93b7bc94907a9ea4 /src/server/game/Maps/Map.cpp | |
| parent | b8c0aeaf14dfabc9940203aec21ef29111e755cc (diff) | |
Entities/Creature: Some asserts are now LOG_ERRORs that block spawning. Fix a group spawning bug exposed by the CoS merge. Improve some command output.
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index d3abfa05a9b..b5872430156 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3277,9 +3277,9 @@ bool Map::SpawnGroupSpawn(uint32 groupId, bool ignoreRespawn, bool force, std::v continue; time_t respawnTime = GetRespawnTime(data->type, data->spawnId); - if (respawnTime && respawnTime > GameTime::GetGameTime()) + if (respawnTime) { - if (!force && !ignoreRespawn) + if (!force && !ignoreRespawn && (respawnTime > GameTime::GetGameTime())) continue; // we need to remove the respawn time, otherwise we'd end up double spawning |