From 4c120528ec9428a7ad45982950959af622a61b04 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 15 Nov 2018 19:35:50 -0500 Subject: [PATCH] v0.7.1: improved how quickslots handled upgraded items --- .../com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java | 2 +- .../com/shatteredpixel/shatteredpixeldungeon/items/Item.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java index cd7b0be78..c36c2399b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java @@ -92,7 +92,7 @@ public class QuickSlot { } public void convertToPlaceholder(Item item){ - Item placeholder = Item.virtual(item.getClass()); + Item placeholder = item.virtual(); if (placeholder != null && contains(item)) for (int i = 0; i < SIZE; i++) 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 62de17571..ab0e731ea 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -425,11 +425,12 @@ public class Item implements Bundlable { return 0; } - public static Item virtual( Class cl ) { + public Item virtual(){ try { - Item item = (Item)cl.newInstance(); + Item item = getClass().newInstance(); item.quantity = 0; + item.level = level; return item; } catch (Exception e) {