Fixes #68 - Implement check for nil parent in GetMapUntil()

Bestride · Nov 2, 2018 · f1e76fe · f1e76fe
1 parent d123922
commit f1e76fe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/BeStride.lua b/BeStride.lua
@@ -549,8 +549,8 @@ end
 
 function BeStride:GetMapUntil(locID,filter)
 	local map = C_Map.GetMapInfo(locID)
-	if map["mapType"] ~= filter and map["mapType"] > filter then
-		return BeStride:GetMapUntil(map["parentMapID"],filter)
+	if map.mapType ~= filter and map.mapType > filter and map.parentMapID ~= nil and map.parentMapID ~= 0 then
+		return BeStride:GetMapUntil(map.parentMapID,filter)
 	else
 		return map
 	end

diff --git a/BeStride_Debug.lua b/BeStride_Debug.lua
@@ -69,8 +69,8 @@ function BeStride_Debug:DebugGetMapUntil(locID,filter)
 	if map ~= nil then
 		self:Debug(map.mapID .. "," .. map.name .. "," .. map.mapType .. "," .. map.parentMapID)
 	end
-	if map["mapType"] ~= filter and map["mapType"] > filter then
-		return self:DebugGetMapUntil(map["parentMapID"],filter)
+	if map.mapType ~= filter and map.mapType > filter and map.parentMapID ~= nil and map.parentMapID ~= 0 then
+		return self:DebugGetMapUntil(map.parentMapID,filter)
 	else
 		return map
 	end

diff --git a/localization/en-US.lua b/localization/en-US.lua
@@ -1,5 +1,4 @@
 
-
 BeStride_Locale = {
 	Options = {
 		OpenGUI = "Open GUI"

diff --git a/localization/zh-TW.lua b/localization/zh-TW.lua
@@ -35,6 +35,12 @@ if GetLocale() == "zhTW" then
 			Passenger = "強制多載坐騎按鈕"
 		},
 		Zone = {
+			AzuremystIsle = {
+				Name = "Azuremyst Isle"
+			},
+			BloodmystIsle = {
+				Name = "Bloodmyst Isle"
+			},
 			Deadmines = {
 				Name = "死亡礦坑"
 			},
@@ -169,4 +175,4 @@ if GetLocale() == "zhTW" then
 			}
 		}
 	}
-end
+end