Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
# Conflicts:
#	src/server/game/Maps/Map.cpp
#	src/server/scripts/Commands/cs_list.cpp
This commit is contained in:
Treeston
2019-07-07 19:18:32 +02:00
committed by Ovahlord
parent b6cbd70533
commit 83a25ce554
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Maps/Map.cpp
View File

@@ -3410,9 +3410,9 @@ bool Map::SpawnGroupSpawn(uint32 groupId, bool ignoreRespawn, bool force, std::v
continue;
time_t respawnTime = GetRespawnTime(data->type, data->spawnId);
if (respawnTime && respawnTime > time(NULL))
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