mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 22:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10915] Restore GameEvent system work after last Map terain rewrite.

Browse source
This commit is contained in:
VladimirMangos 2010-12-24 15:40:44 +03:00
parent d1b0e5b40f
commit e2a8c3a119
1 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/GameEventMgr.cpp
View file

@ -568,10 +568,8 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
sObjectMgr.AddCreatureToGrid(*itr, data); sObjectMgr.AddCreatureToGrid(*itr, data);
// Spawn if necessary (loaded grids only) // Spawn if necessary (loaded grids only)
Map* map = const_cast<Map*>(sMapMgr.FindMap(data->mapid)); if (Map* map = const_cast<Map*>(sMapMgr.FindMap(data->mapid)))
if(!map) {
return;
// We use spawn coords to spawn // We use spawn coords to spawn
if (!map->Instanceable() && map->IsLoaded(data->posX,data->posY)) if (!map->Instanceable() && map->IsLoaded(data->posX,data->posY))
{ {
@ -588,6 +586,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
} }
} }
} }
}
if (internal_event_id < 0 || (size_t)internal_event_id >= mGameEventGameobjectGuids.size()) if (internal_event_id < 0 || (size_t)internal_event_id >= mGameEventGameobjectGuids.size())
{ {
@ -617,10 +616,8 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
// Spawn if necessary (loaded grids only) // Spawn if necessary (loaded grids only)
// this base map checked as non-instanced and then only existing // this base map checked as non-instanced and then only existing
Map* map = const_cast<Map*>(sMapMgr.FindMap(data->mapid)); if (Map* map = const_cast<Map*>(sMapMgr.FindMap(data->mapid)))
if(!map) {
return;
// We use current coords to unspawn, not spawn coords since creature can have changed grid // We use current coords to unspawn, not spawn coords since creature can have changed grid
if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY)) if (!map->Instanceable() && map->IsLoaded(data->posX, data->posY))
{ {
@ -638,6 +635,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
} }
} }
} }
}
if (event_id > 0) if (event_id > 0)
{ {