From f9f24361d4560793293f0eeae3e816406bce4a0b Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 21 Jun 2021 20:34:11 -0400 Subject: [PATCH] v0.9.3c: fixed Talent.onItemCollected being called on rankings load --- .../com/shatteredpixel/shatteredpixeldungeon/items/Item.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index a3335509e..c8cf65bb5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -205,7 +205,9 @@ public class Item implements Bundlable { if (isSimilar( item )) { item.merge( this ); item.updateQuickslot(); - Talent.onItemCollected( Dungeon.hero, item ); + if (Dungeon.hero != null && Dungeon.hero.isAlive()) { + Talent.onItemCollected(Dungeon.hero, item); + } return true; } }