diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-07-07 19:18:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-14 22:24:24 +0100 |
| commit | 2225cb120100da741814dec7515b191cc68f07be (patch) | |
| tree | 221e60fd68018a13249726d9bd34be2bcfa58d1c /src/server/game/Maps/Map.cpp | |
| parent | f21599dc5dab71cc0775d6ed5d2b2f6f2f4c6780 (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.
(cherry picked from commit ded18a2690063991d5440df7d3e5d526b884ec16)
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 f0504dc4252..8d8a6f2d4bd 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3456,9 +3456,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 |