From f1e76fe3ed35d39072ba59f3560b20716158f170 Mon Sep 17 00:00:00 2001
From: dansheps <dans@dansheps.com>
Date: Fri, 2 Nov 2018 10:27:46 -0500
Subject: [PATCH] Fixes #68 - Implement check for nil parent in GetMapUntil()

---
 BeStride.lua           | 4 ++--
 BeStride_Debug.lua     | 4 ++--
 localization/en-US.lua | 1 -
 localization/zh-TW.lua | 8 +++++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/BeStride.lua b/BeStride.lua
index f3b8e0c..a41d03d 100644
--- 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
index 6e70f14..49ef61f 100644
--- 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
index 9f951fb..b44dc1d 100644
--- 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
index 5ba15b5..74b5a7c 100644
--- 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
\ No newline at end of file