From 8abfa7a8c775dc08d6e117fff3e682b3772e0220 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 22 Jan 2021 20:04:13 -0500 Subject: [PATCH] v0.9.2: fixed Heap.replace not merging stackable items --- .../shatteredpixel/shatteredpixeldungeon/items/Heap.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java index ed1c22933..838babf15 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java @@ -175,6 +175,12 @@ public class Heap implements Bundlable { int index = items.indexOf( a ); if (index != -1) { items.remove( index ); + for (Item i : items) { + if (i.isSimilar( b )) { + i.merge( b ); + return; + } + } items.add( index, b ); } }