Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

game event respawn

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/4e7727d575f2c22dddc6327d89e0cfecb9b9748e)
This commit is contained in:
hondacrx
2021-12-17 17:55:34 -05:00
parent d5aa3ed8ab
commit 853b589348
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Events/GameEventManager.cs
+6 -2
View File
@@ -1190,7 +1190,8 @@ namespace Game
Global.ObjectMgr.AddCreatureToGrid(guid, data); Global.ObjectMgr.AddCreatureToGrid(guid, data);
// Spawn if necessary (loaded grids only) // Spawn if necessary (loaded grids only)
Map map = Global.MapMgr.FindMap(data.spawnPoint.GetMapId(), 0); Map map = Global.MapMgr.CreateBaseMap(data.spawnPoint.GetMapId());
map.RemoveRespawnTime(SpawnObjectType.Creature, guid);
// We use spawn coords to spawn // We use spawn coords to spawn
if (map != null && !map.Instanceable() && map.IsGridLoaded(data.spawnPoint)) if (map != null && !map.Instanceable() && map.IsGridLoaded(data.spawnPoint))
Creature.CreateCreatureFromDB(guid, map); Creature.CreateCreatureFromDB(guid, map);
@@ -1213,7 +1214,8 @@ namespace Game
Global.ObjectMgr.AddGameObjectToGrid(guid, data); Global.ObjectMgr.AddGameObjectToGrid(guid, data);
// Spawn if necessary (loaded grids only) // Spawn if necessary (loaded grids only)
// this base map checked as non-instanced and then only existed // this base map checked as non-instanced and then only existed
Map map = Global.MapMgr.FindMap(data.spawnPoint.GetMapId(), 0); Map map = Global.MapMgr.CreateBaseMap(data.spawnPoint.GetMapId());
map.RemoveRespawnTime(SpawnObjectType.GameObject, guid);
// 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 != null && !map.Instanceable() && map.IsGridLoaded(data.spawnPoint)) if (map != null && !map.Instanceable() && map.IsGridLoaded(data.spawnPoint))
{ {
@@ -1265,6 +1267,7 @@ namespace Game
Global.MapMgr.DoForAllMapsWithMapId(data.spawnPoint.GetMapId(), map => Global.MapMgr.DoForAllMapsWithMapId(data.spawnPoint.GetMapId(), map =>
{ {
map.RemoveRespawnTime(SpawnObjectType.Creature, guid);
var creatureBounds = map.GetCreatureBySpawnIdStore().LookupByKey(guid); var creatureBounds = map.GetCreatureBySpawnIdStore().LookupByKey(guid);
foreach (var creature in creatureBounds) foreach (var creature in creatureBounds)
creature.AddObjectToRemoveList(); creature.AddObjectToRemoveList();
@@ -1292,6 +1295,7 @@ namespace Game
Global.MapMgr.DoForAllMapsWithMapId(data.spawnPoint.GetMapId(), map => Global.MapMgr.DoForAllMapsWithMapId(data.spawnPoint.GetMapId(), map =>
{ {
map.RemoveRespawnTime(SpawnObjectType.GameObject, guid);
var gameobjectBounds = map.GetGameObjectBySpawnIdStore().LookupByKey(guid); var gameobjectBounds = map.GetGameObjectBySpawnIdStore().LookupByKey(guid);
foreach (var go in gameobjectBounds) foreach (var go in gameobjectBounds)
go.AddObjectToRemoveList(); go.AddObjectToRemoveList();