From 3849a710ac0b7e5952eacfbebaed1536d5fafc10 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 7 Apr 2022 13:11:42 -0400
Subject: [PATCH] v1.2.2: made hero.tier() more resistant to threading issues

---
 .../shatteredpixeldungeon/actors/hero/Hero.java           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
index 861f30fd8..5feb3e8e8 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -72,6 +72,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.items.Heap.Type;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon;
+import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.AntiMagic;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Brimstone;
@@ -413,10 +414,11 @@ public class Hero extends Char {
 	}
 	
 	public int tier() {
-		if (belongings.armor() instanceof ClassArmor){
+		Armor armor = belongings.armor();
+		if (armor instanceof ClassArmor){
 			return 6;
-		} else if (belongings.armor() != null){
-			return belongings.armor().tier;
+		} else if (armor != null){
+			return armor.tier;
 		} else {
 			return 0;
 		}