From 2b4cfd79eadeafd65cd64e1eef259b08aca3fb3f Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 11 Apr 2025 12:19:23 -0400 Subject: [PATCH] v3.1.0: fixed crashes caused by loading existing Warrior saves --- .../shatteredpixeldungeon/items/BrokenSeal.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java index f2eb66d64..b037daaa9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java @@ -371,11 +371,10 @@ public class BrokenSeal extends Item { if (bundle.contains(COOLDOWN)) { cooldown = bundle.getInt(COOLDOWN); turnsSinceEnemies = bundle.getInt(TURNS_SINCE_ENEMIES); - } else { - //pre-3.1 shield, normally just clear it, but retain if it's big and possibly from berserking - if (shielding() < maxShield()+5 && target.HP > 0){ - setShield(0); - } + + //if we have shield from pre-3.1, have it last a bit + } else if (shielding() > 0) { + turnsSinceEnemies = -100; } } }