mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 19:37:02 +00:00
[11150] Enable GameEvent system full features for instanceable maps.
This commit is contained in:
parent
4aa3361f51
commit
a598fb5312
2 changed files with 3 additions and 13 deletions
|
|
@ -710,12 +710,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
|
||||||
|
|
||||||
sObjectMgr.AddCreatureToGrid(*itr, data);
|
sObjectMgr.AddCreatureToGrid(*itr, data);
|
||||||
|
|
||||||
// FIXME: gameevent system can't work correctly in instanceable maps while object sin instances use dynamic guids
|
Creature::SpawnInMaps(*itr, data);
|
||||||
// Current code prevent wrong way work until switch to use static guids for instance objects
|
|
||||||
MapEntry const* mapEntry = sMapStore.LookupEntry(data->mapid);
|
|
||||||
|
|
||||||
if (mapEntry && !mapEntry->Instanceable())
|
|
||||||
Creature::SpawnInMaps(*itr, data);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -745,12 +740,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
|
||||||
|
|
||||||
sObjectMgr.AddGameobjectToGrid(*itr, data);
|
sObjectMgr.AddGameobjectToGrid(*itr, data);
|
||||||
|
|
||||||
// FIXME: gameevent system can't work correctly in instanceable maps while object sin instances use dynamic guids
|
GameObject::SpawnInMaps(*itr, data);
|
||||||
// Current code prevent wrong way work until switch to use static guids for instance objects
|
|
||||||
MapEntry const* mapEntry = sMapStore.LookupEntry(data->mapid);
|
|
||||||
|
|
||||||
if (mapEntry && !mapEntry->Instanceable())
|
|
||||||
GameObject::SpawnInMaps(*itr, data);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "11149"
|
#define REVISION_NR "11150"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue