--- arh.lua	Sun Oct 30 12:04:54 2016
+++ arh.lua	Tue Sep 25 00:19:46 2018
@@ -1094,14 +1095,19 @@
 
 function addon:UpdateConsPositions(player_x, player_y, player_a)
 	local cos, sin = math.cos(player_a), math.sin(player_a)
+	
 	for _,item in ipairs(addon.ConsArray) do
-		local dx, dy = item.x-player_x, item.y-player_y
+		--print(item.x .. "   " .. player_x)
+		--print(item.y .. "   " .. player_y)
+		local dx, dy = item.x - player_x, item.y - player_y
 		local x = dx*cos - dy*sin
 		local y = dx*sin + dy*cos
 		local rot = item.a-player_a
-
+	
 		--item.texture:ClearAllPoints()
+		-- 4000 = too fast
 		item.texture:SetPoint("CENTER", Arh_HudFrame, "CENTER", x*PixelsInYardOnHud, -y*PixelsInYardOnHud)
+		--item.texture:SetPoint("CENTER", Arh_HudFrame, "CENTER", -25, -75)
 		RotateTexture(item, rot)
 	end
 end
@@ -1137,9 +1143,13 @@
 
 local _lastmapid, _lastmaptext
 function addon:GetPos()
-  local oldcont = GetCurrentMapContinent()
-  local oldmap = GetCurrentMapAreaID()
-  local oldlvl = GetCurrentMapDungeonLevel()
+  --local oldcont = GetCurrentMapContinent()
+  --local oldmap = GetCurrentMapAreaID()
+  --local oldlvl = GetCurrentMapDungeonLevel()
+  local oldmap = C_Map.GetBestMapForUnit('player')
+  local mappos = C_Map.GetPlayerMapPosition(oldmap, 'player')
+  local oldcont = C_Map.GetWorldPosFromMapPos(oldmap, mappos)
+  local oldlvl = 0
   local map = oldmap
   local level = oldlvl
   local text = GetRealZoneText()
@@ -1152,14 +1162,18 @@
       WorldMapFrame:Hide()
       flicker = true
     end
-    SetMapToCurrentZone()
-    map = GetCurrentMapAreaID()
-    level = GetCurrentMapDungeonLevel();
+    --SetMapToCurrentZone()
+    --map = GetCurrentMapAreaID()
+    local map = C_Map.GetBestMapForUnit('player')
+    --level = GetCurrentMapDungeonLevel();
+    level = 0
     --print("SetMapToCurrentZone: "..oldmap.."->"..map)
     _lastmapid = map
     _lastmaptext = text
   end
-  local x, y = GetPlayerMapPosition("player")
+  
+  local x, y = C_Map.GetPlayerMapPosition(map, "player"):GetXY()  
+  
   if flicker then
     WorldMapFrame:Show()
     if oldmap ~= map then
@@ -1176,12 +1190,38 @@
 
 function addon:GetPosYards()
   local x,y,map,level = addon:GetPos()
+  
   if x and y and map and x + y > 0 then
-    local id, _, _, left, right, top, bottom = GetAreaMapInfo(map)
+    --local id, _, _, left, right, top, bottom = GetAreaMapInfo(map)
+	--[[local hitrect = C_MapExplorationInfo.GetExploredMapTextures(map)
+	local top, bottom, left, right
+	for key, value in next, hitrect do
+		for k, v in next, value do
+			if k == "hitRect" then
+				for r, t in next, v do
+					if r == "bottom" then bottom = t end
+					if r == "top" then top = t end
+					if r == "left" then left = t end
+					if r == "right" then right = t end
+				end
+			end
+		end
+	end]]--
+  local vector00, vector05 = CreateVector2D(0, 0), CreateVector2D(0.5, 0.5)
+  local mapID = C_Map.GetBestMapForUnit('player');
+  local instance, topLeft = C_Map.GetWorldPosFromMapPos(mapID, vector00)
+  local _, bottomRight = C_Map.GetWorldPosFromMapPos(mapID, vector05)
+  local top, left = topLeft:GetXY()
+  local bottom, right = bottomRight:GetXY()
+  bottom = top + (bottom - top) * 2
+  right = left + (right - left) * 2
+	
+	--[[
     if left == right or top == bottom then 
       -- instanced areas should never be relevant to arch, but useful for testing
       _, right, left, bottom, top = GetDungeonMapInfo(map)
     end
+	--]]
     if left and right and left > right then
       x = x * (left - right)
     end
@@ -1189,6 +1229,7 @@
       y = y * (top - bottom)
     end
   end
+  
   return x,y,map,level
 end
 
@@ -1228,9 +1269,9 @@
 end
 
 local function AddPoint(color)
-        local jax, jay = addon:GetPosYards()
+    local jax, jay = addon:GetPosYards()
 	a = GetPlayerFacing()
-
+	
 	AddCon(color, jax, jay, a)
 	PlaySound(SOUND_ADDCON)
 end
@@ -1404,9 +1445,11 @@
 SlashCmdList["ARH"] = handler;
 SLASH_ARH1 = "/arh"
 
-local function OnSpellSent(unit,spellcast,rank,target)
+--local function OnSpellSent(unit,spellcast,rank,target)
+local function OnSpellSent(unit,target,rank,spellcast)
 	if unit ~= "player" then return end
-	if spellcast==GetSpellInfo(73979) then -- "Searching for Artifacts"
+	--if spellcast==GetSpellInfo(73979) then -- "Searching for Artifacts"
+	if spellcast==73979 then -- "Searching for Artifacts"
 		addon:OnGathering()
 	end
 end
@@ -1707,6 +1750,7 @@
 
 local last_update_hud = 0
 function Arh_HudFrame_OnUpdate(frame, elapsed)
+	-- I'M MOVING
 	last_update_hud = last_update_hud + elapsed
 	if last_update_hud > 0.05 then
 
@@ -1809,4 +1853,4 @@
 	if cfg.HUD.UseGatherMate2 then
 		UseGatherMate2(false)
 	end
-end
+end
\ No newline at end of file