From 42a37ec1ac568e778a7e47585aaa2d1b9a928295 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Wed, 21 Jun 2017 16:43:15 -0400
Subject: [PATCH] v0.6.1: fixed a couple of bugs leftover from ring mechanics
 changes

---
 .../shatteredpixeldungeon/items/rings/Ring.java              | 5 +++++
 .../items/scrolls/ScrollOfRemoveCurse.java                   | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
index c8c00cdcd..29df6e92b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
@@ -248,6 +248,11 @@ public class Ring extends KindofMisc {
 		if ((ticksToKnow = bundle.getInt( UNFAMILIRIARITY )) == 0) {
 			ticksToKnow = TICKS_TO_KNOW;
 		}
+		
+		//pre-0.6.1 saves
+		if (level() < 0){
+			upgrade(-level());
+		}
 	}
 
 	public static int getBonus(Char target, Class<?extends RingBuff> type){
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java
index c1c33edd0..ab5b7aba9 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java
@@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
 import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
-import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -80,9 +79,6 @@ public class ScrollOfRemoveCurse extends InventoryScroll {
 					procced = true;
 				}
 			}
-			if (item instanceof Ring && item.level() <= 0){
-				item.upgrade(1 - item.level());
-			}
 			if (item instanceof Bag){
 				for (Item bagItem : ((Bag)item).items){
 					if (bagItem != null && bagItem.cursed) {