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

Core/Maps: Replace some Instanceable() checks with IsDungeon()

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/8466894d816f484f30cdbe47b980a142870c955e)
This commit is contained in:
hondacrx
2022-07-20 21:38:47 -04:00
parent e7bb4745e0
commit 732609fd87
7 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/GoCommands.cs
+4 -5
View File
@@ -424,17 +424,16 @@ namespace Game.Chat.Commands
AreaTableRecord zoneEntry = areaEntry.ParentAreaID != 0 ? CliDB.AreaTableStorage.LookupByKey(areaEntry.ParentAreaID) : areaEntry;
Cypher.Assert(zoneEntry != null);
x /= 100.0f;
y /= 100.0f;
Map map = Global.MapMgr.CreateBaseMap(zoneEntry.ContinentID);
if (map.Instanceable())
if (!Global.DB2Mgr.Zone2MapCoordinates(areaEntry.ParentAreaID != 0 ? areaEntry.ParentAreaID : areaId, ref x, ref y))
{
handler.SendSysMessage(CypherStrings.InvalidZoneMap, areaId, areaEntry.AreaName[handler.GetSessionDbcLocale()], map.GetId(), map.GetMapName());
return false;
}
x /= 100.0f;
y /= 100.0f;
Global.DB2Mgr.Zone2MapCoordinates(areaEntry.ParentAreaID != 0 ? areaEntry.ParentAreaID : areaId, ref x, ref y);
if (!GridDefines.IsValidMapCoord(zoneEntry.ContinentID, x, y))
{
handler.SendSysMessage(CypherStrings.InvalidTargetCoord, x, y, zoneEntry.ContinentID);
Source/Game/Chat/Commands/MiscCommands.cs
+1 -1
View File
@@ -1816,7 +1816,7 @@ namespace Game.Chat
if (!target.GetMap().IsBattlegroundOrArena())
target.SetBattlegroundEntryPoint();
}
else if (map.Instanceable())
else if (map.IsDungeon())
{
Map targetMap = target.GetMap();