From 2dccaa10be82ab6404ae0e9d66dcc627401b7d51 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 26 Jan 2021 19:38:37 -0500 Subject: [PATCH] Core/Commands: Fixed .go zonexy command Port From (https://github.com/TrinityCore/TrinityCore/commit/5274f5ea545d19d0aa1a0f26b3c09c1585862304) --- Source/Game/Chat/Commands/GoCommands.cs | 3 +++ Source/Game/DataStorage/DB2Manager.cs | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/Game/Chat/Commands/GoCommands.cs b/Source/Game/Chat/Commands/GoCommands.cs index 8e354be92..96b987cd7 100644 --- a/Source/Game/Chat/Commands/GoCommands.cs +++ b/Source/Game/Chat/Commands/GoCommands.cs @@ -417,6 +417,9 @@ namespace Game.Chat.Commands 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)) diff --git a/Source/Game/DataStorage/DB2Manager.cs b/Source/Game/DataStorage/DB2Manager.cs index 4aed772e7..4202e2365 100644 --- a/Source/Game/DataStorage/DB2Manager.cs +++ b/Source/Game/DataStorage/DB2Manager.cs @@ -2223,10 +2223,10 @@ namespace Game.DataStorage if (assignment.MapID >= 0 && assignment.MapID != areaEntry.ContinentID) continue; - float tmpY = 1.0f - ((y - assignment.UiMin.Y) / (assignment.UiMax.Y - assignment.UiMin.Y)); - float tmpX = 1.0f - ((x - assignment.UiMin.X) / (assignment.UiMax.X - assignment.UiMin.X)); - y = ((1.0f - tmpY) * assignment.Region[0].X) + (tmpY * assignment.Region[1].X); - x = ((1.0f - tmpX) * assignment.Region[0].Y) + (tmpX * assignment.Region[1].Y); + float tmpY = (y - assignment.UiMax.Y) / (assignment.UiMin.Y - assignment.UiMax.Y); + float tmpX = (x - assignment.UiMax.X) / (assignment.UiMin.X - assignment.UiMax.X); + x = assignment.Region[0].X + tmpY * (assignment.Region[1].X - assignment.Region[0].X); + y = assignment.Region[0].Y + tmpX * (assignment.Region[1].Y - assignment.Region[0].Y); break; } }