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

Core/Objects: Remove restriction on what object types can be set as active

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3031fbb63bfb2df2aa041bd9c04c5c42b0c07c05)
This commit is contained in:
hondacrx
2022-06-02 22:28:03 -04:00
parent 2cc0b372bf
commit e65ce31742
1 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/Map.cs
+58 -30
View File
@@ -3088,24 +3088,38 @@ namespace Game.Maps
{ {
AddToActiveHelper(obj); AddToActiveHelper(obj);
if (obj.IsTypeId(TypeId.Unit)) Position respawnLocation = null;
switch (obj.GetTypeId())
{ {
Creature c = obj.ToCreature(); case TypeId.Unit:
// also not allow unloading spawn grid to prevent creating creature clone at load Creature creature = obj.ToCreature();
if (!c.IsPet() && c.GetSpawnId() != 0) if (creature != null && !creature.IsPet() && creature.GetSpawnId() != 0)
{
float x, y;
c.GetRespawnPosition(out x, out y, out _);
GridCoord p = GridDefines.ComputeGridCoord(x, y);
if (GetGrid(p.X_coord, p.Y_coord) != null)
GetGrid(p.X_coord, p.Y_coord).IncUnloadActiveLock();
else
{ {
GridCoord p2 = GridDefines.ComputeGridCoord(c.GetPositionX(), c.GetPositionY()); respawnLocation = new();
Log.outError(LogFilter.Maps, creature.GetRespawnPosition(out respawnLocation.posX, out respawnLocation.posY, out respawnLocation.posZ);
"Active creature (GUID: {0} Entry: {1}) added to grid[{2}, {3}] but spawn grid[{4}, {5}] was not loaded.",
c.GetGUID().ToString(), c.GetEntry(), p.X_coord, p.Y_coord, p2.X_coord, p2.Y_coord);
} }
break;
case TypeId.GameObject:
GameObject gameObject = obj.ToGameObject(); ;
if (gameObject != null && gameObject.GetSpawnId() != 0)
{
respawnLocation = new();
gameObject.GetRespawnPosition(out respawnLocation.posX, out respawnLocation.posY, out respawnLocation.posZ, out _);
}
break;
default:
break;
}
if (respawnLocation != null)
{
GridCoord p = GridDefines.ComputeGridCoord(respawnLocation.GetPositionX(), respawnLocation.GetPositionY());
if (GetGrid(p.X_coord, p.Y_coord) != null)
GetGrid(p.X_coord, p.Y_coord).IncUnloadActiveLock();
else
{
GridCoord p2 = GridDefines.ComputeGridCoord(obj.GetPositionX(), obj.GetPositionY());
Log.outError(LogFilter.Maps, $"Active object {obj.GetGUID()} added to grid[{p.X_coord}, {p.Y_coord}] but spawn grid[{p2.X_coord}, {p2.Y_coord}] was not loaded.");
} }
} }
} }
@@ -3119,24 +3133,38 @@ namespace Game.Maps
{ {
RemoveFromActiveHelper(obj); RemoveFromActiveHelper(obj);
if (obj.IsTypeId(TypeId.Unit)) Position respawnLocation = null;
switch (obj.GetTypeId())
{ {
Creature c = obj.ToCreature(); case TypeId.Unit:
// also allow unloading spawn grid Creature creature = obj.ToCreature();
if (!c.IsPet() && c.GetSpawnId() != 0) if (creature != null && !creature.IsPet() && creature.GetSpawnId() != 0)
{
float x, y;
c.GetRespawnPosition(out x, out y, out _);
GridCoord p = GridDefines.ComputeGridCoord(x, y);
if (GetGrid(p.X_coord, p.Y_coord) != null)
GetGrid(p.X_coord, p.Y_coord).DecUnloadActiveLock();
else
{ {
GridCoord p2 = GridDefines.ComputeGridCoord(c.GetPositionX(), c.GetPositionY()); respawnLocation = new();
Log.outDebug(LogFilter.Maps, creature.GetRespawnPosition(out respawnLocation.posX, out respawnLocation.posY, out respawnLocation.posZ);
"Active creature (GUID: {0} Entry: {1}) removed from grid[{2}, {3}] but spawn grid[{4}, {5}] was not loaded.",
c.GetGUID().ToString(), c.GetEntry(), p.X_coord, p.Y_coord, p2.X_coord, p2.Y_coord);
} }
break;
case TypeId.GameObject:
GameObject gameObject = obj.ToGameObject();
if (gameObject != null && gameObject.GetSpawnId() != 0)
{
respawnLocation = new();
gameObject.GetRespawnPosition(out respawnLocation.posX, out respawnLocation.posY, out respawnLocation.posZ, out _);
}
break;
default:
break;
}
if (respawnLocation != null)
{
GridCoord p = GridDefines.ComputeGridCoord(respawnLocation.GetPositionX(), respawnLocation.GetPositionY());
if (GetGrid(p.X_coord, p.Y_coord) != null)
GetGrid(p.X_coord, p.Y_coord).DecUnloadActiveLock();
else
{
GridCoord p2 = GridDefines.ComputeGridCoord(obj.GetPositionX(), obj.GetPositionY());
Log.outDebug(LogFilter.Maps, $"Active object {obj.GetGUID()} removed from grid[{p.X_coord}, {p.Y_coord}] but spawn grid[{p2.X_coord}, {p2.Y_coord}] was not loaded.");
} }
} }
} }