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

Core/Maps: Move terrain data handling out of Map class

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/16a06346aea16ffd6ee84081cedfdb0c75ac0b38)
This commit is contained in:
hondacrx
2022-07-24 16:31:00 -04:00
parent c4344fbf66
commit 3cd58e4a17
25 changed files with 1035 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Phasing/PhasingHandler.cs
+7 -7
View File
@@ -552,23 +552,23 @@ namespace Game
return obj.GetPhaseShift().CanSee(phaseShift);
}
public static uint GetTerrainMapId(PhaseShift phaseShift, Map map, float x, float y)
public static uint GetTerrainMapId(PhaseShift phaseShift, TerrainInfo terrain, float x, float y)
{
if (phaseShift.VisibleMapIds.Empty())
return map.GetId();
return terrain.GetId();
if (phaseShift.VisibleMapIds.Count == 1)
return phaseShift.VisibleMapIds.First().Key;
GridCoord gridCoord = GridDefines.ComputeGridCoord(x, y);
uint gx = ((MapConst.MaxGrids - 1) - gridCoord.X_coord);
uint gy = ((MapConst.MaxGrids - 1) - gridCoord.Y_coord);
int gx = (int)((MapConst.MaxGrids - 1) - gridCoord.X_coord);
int gy = (int)((MapConst.MaxGrids - 1) - gridCoord.Y_coord);
foreach (var visibleMap in phaseShift.VisibleMapIds)
if (map.HasChildMapGridFile(visibleMap.Key, gx, gy))
if (terrain.HasChildTerrainGridFile(visibleMap.Key, gx, gy))
return visibleMap.Key;
return map.GetId();
return terrain.GetId();
}
public static void SetAlwaysVisible(WorldObject obj, bool apply, bool updateVisibility)
@@ -705,7 +705,7 @@ namespace Game
{
if (!summonGuid.IsEmpty())
{
Creature summon = unit.GetMap().GetCreature(summonGuid);
Creature summon = ObjectAccessor.GetCreature(unit, summonGuid);
if (summon != null)
if (_visited.Add(summon))
func(summon);