From eb0dd4b47c1f31b876d6e5558e54a7cff3ead75e Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Fri, 4 May 2018 16:10:45 -0400
Subject: [PATCH] v0.6.5a: added a safety check to pickup up from heaps

---
 .../com/shatteredpixel/shatteredpixeldungeon/items/Heap.java  | 4 ++++
 1 file changed, 4 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 7bdad3b5f..79fdaa2de 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java
@@ -160,6 +160,10 @@ public class Heap implements Bundlable {
 	
 	public Item pickUp() {
 		
+		if (items.isEmpty()){
+			destroy();
+			return null;
+		}
 		Item item = items.removeFirst();
 		if (items.isEmpty()) {
 			destroy();