From 9d63559e2d7408ede1df2c722c880310cf28ca89 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Thu, 9 Nov 2017 05:06:31 -0500
Subject: [PATCH] v0.6.2b: fixed containers clearing quickslots when collected

---
 .../shatteredpixeldungeon/items/bags/Bag.java         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java
index 8975acc8a..0afd75295 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java
@@ -69,9 +69,14 @@ public class Bag extends Item implements Iterable<Item> {
 
 		for (Item item : container.items.toArray( new Item[0] )) {
 			if (grab( item )) {
-				item.detachAll( container );
-				if (!item.collect( this ))
-					item.collect( container );
+				int slot = Dungeon.quickslot.getSlot(item);
+				item.detachAll(container);
+				if (!item.collect(this)) {
+					item.collect(container);
+				}
+				if (slot != -1) {
+					Dungeon.quickslot.setSlot(slot, item);
+				}
 			}
 		}