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

Core/DataStores: Updated db2 structures to 8.2.5

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/3ac790287aba5f7d7c3bccf79e608de9119e461a)
This commit is contained in:
hondacrx
2019-10-29 13:09:23 -04:00
parent c6e53b2ba7
commit e95115dc94
54 changed files with 4589 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattleFields/BattleField.cs
+7 -7
View File
@@ -596,7 +596,7 @@ namespace Game.BattleFields
return null;
}
public WorldSafeLocsRecord GetClosestGraveYard(Player player)
public WorldSafeLocsEntry GetClosestGraveYard(Player player)
{
BfGraveyard closestGY = null;
float maxdist = -1;
@@ -617,7 +617,7 @@ namespace Game.BattleFields
}
if (closestGY != null)
return CliDB.WorldSafeLocsStorage.LookupByKey(closestGY.GetGraveyardId());
return Global.ObjectMgr.GetWorldSafeLoc(closestGY.GetGraveyardId());
return null;
}
@@ -891,8 +891,8 @@ namespace Game.BattleFields
public float GetDistance(Player player)
{
WorldSafeLocsRecord safeLoc = CliDB.WorldSafeLocsStorage.LookupByKey(m_GraveyardId);
return player.GetDistance2d(safeLoc.Loc.X, safeLoc.Loc.Y);
WorldSafeLocsEntry safeLoc = Global.ObjectMgr.GetWorldSafeLoc(m_GraveyardId);
return player.GetDistance2d(safeLoc.Loc.GetPositionX(), safeLoc.Loc.GetPositionY());
}
public void AddPlayer(ObjectGuid playerGuid)
@@ -964,7 +964,7 @@ namespace Game.BattleFields
void RelocateDeadPlayers()
{
WorldSafeLocsRecord closestGrave = null;
WorldSafeLocsEntry closestGrave = null;
foreach (var guid in m_ResurrectQueue)
{
Player player = Global.ObjAccessor.FindPlayer(guid);
@@ -972,12 +972,12 @@ namespace Game.BattleFields
continue;
if (closestGrave != null)
player.TeleportTo(player.GetMapId(), closestGrave.Loc.X, closestGrave.Loc.Y, closestGrave.Loc.Z, player.GetOrientation());
player.TeleportTo(closestGrave.Loc);
else
{
closestGrave = m_Bf.GetClosestGraveYard(player);
if (closestGrave != null)
player.TeleportTo(player.GetMapId(), closestGrave.Loc.X, closestGrave.Loc.Y, closestGrave.Loc.Z, player.GetOrientation());
player.TeleportTo(closestGrave.Loc);
}
}
}