- Patch 8.0.1

2018-07-17 12:07:40 -03:00
parent 6ef270ac6f
commit df9ce12b82
83 changed files with 7973 additions and 5234 deletions
@@ -111,26 +111,23 @@
 		end
 	
 		local boss_found = function (index, name, zone, mapid, diff, encounterid)
-			
+		
+			local mapID = C_Map.GetBestMapForUnit ("player")
 			local ejid
-			
-			if (_detalhes.IsBFAClient) then
-				local mapID = C_Map.GetBestMapForUnit ("player")
-				if (mapID) then
-					ejid = EJ_GetInstanceForMap (mapID)
-				end
-				
-				if (not mapID) then
-					--print ("Details! exeption handled: zone has no map")
-					return
-				end
-			else
-				ejid = EJ_GetCurrentInstance()
-				if (ejid == 0) then
-					ejid = _detalhes:GetInstanceEJID()
-				end
+			if (mapID) then
+				ejid = EJ_GetInstanceForMap (mapID)
 			end
-
+			
+			if (not mapID) then
+				--print ("Details! exeption handled: zone has no map")
+				return
+			end
+		
+			--local ejid = EJ_GetCurrentInstance()
+			if (ejid == 0) then
+				ejid = _detalhes:GetInstanceEJID()
+			end
+		
 			local boss_table = {
 				index = index,
 				name = name,
@@ -314,7 +311,7 @@
 		-- ~start ~inicio ~novo ñovo
 		function _detalhes:EntrarEmCombate (...)
 			if (_detalhes.debug) then
-				--_detalhes:Msg ("(debug) |cFFFFFF00started a new combat|r|cFFFF7700", _detalhes.encounter_table and _detalhes.encounter_table.name or "")
+				_detalhes:Msg ("(debug) |cFFFFFF00started a new combat|r|cFFFF7700", _detalhes.encounter_table and _detalhes.encounter_table.name or "")
 				--local from = debugstack (2, 1, 0)
 				--print (from)
 			end
@@ -534,22 +531,19 @@
 				if (encounterID) then
 					local ZoneName, InstanceType, DifficultyID, DifficultyName, _, _, _, ZoneMapID = GetInstanceInfo()
 					
-					local ejid
-					if (_detalhes.IsBFAClient) then
-						local mapID = C_Map.GetBestMapForUnit ("player")
-						
-						if (not mapID) then
-							mapID = 0
-						end
-						
-						ejid = EJ_GetInstanceForMap (mapID)
-					else
-						ejid = EJ_GetCurrentInstance()
-						if (ejid == 0) then
-							ejid = _detalhes:GetInstanceEJID()
-						end
+					local mapID = C_Map.GetBestMapForUnit ("player")
+					
+					if (not mapID) then
+						mapID = 0
 					end
 					
+					local ejid = EJ_GetInstanceForMap (mapID)
+					
+					--local ejid = EJ_GetCurrentInstance()
+					
+					if (ejid == 0) then
+						ejid = _detalhes:GetInstanceEJID()
+					end
 					local _, boss_index = _detalhes:GetBossEncounterDetailsFromEncounterId (ZoneMapID, encounterID)

 					_detalhes.tabela_vigente.is_boss = {