From 3e2641cf9ddf35e24abe4815e9a32fa5e3fd6204 Mon Sep 17 00:00:00 2001
From: Florian Roks <froks@users.noreply.github.com>
Date: Sun, 18 Apr 2021 12:33:19 +0200
Subject: [PATCH] first try at fixing trademacro for ultimatum league#

---
 resources/ahk/POE-ItemInfo.ahk | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/resources/ahk/POE-ItemInfo.ahk b/resources/ahk/POE-ItemInfo.ahk
index 24375da0..faeb7d62 100644
--- a/resources/ahk/POE-ItemInfo.ahk
+++ b/resources/ahk/POE-ItemInfo.ahk
@@ -7365,24 +7365,12 @@ ParseItemName(ItemDataChunk, ByRef ItemName, ByRef ItemBaseName, AffixCount = ""
 	
 	Loop, Parse, ItemDataChunk, `n, `r
 	{
-		If (A_Index == 1)
-		{
-			IfNotInString, A_LoopField, Rarity:
-			{
-				return
-			}
-			Else
-			{
-				Continue
-			}
-		}
-		
 		If (StrLen(A_LoopField) == 0 or A_LoopField == "--------" or A_Index > 3)
 		{
 			return
 		}
 		
-		If (A_Index = 2)
+		If (A_Index = 1)
 		{
 			If InStr(A_LoopField, ">>")
 			{
@@ -7433,6 +7421,17 @@ ParseItemName(ItemDataChunk, ByRef ItemName, ByRef ItemBaseName, AffixCount = ""
 				}
 			}
 		}
+		If (A_Index == 2)
+		{
+			IfNotInString, A_LoopField, Rarity:
+			{
+				return
+			}
+			Else
+			{
+				Continue
+			}
+		}
 		If (A_Index = 3)
 		{
 			ItemBaseName := A_LoopField