From 07692d78796219a36186057b16b246e19a1b7fb5 Mon Sep 17 00:00:00 2001
From: johni0702 <me@johni0702.de>
Date: Sun, 11 Oct 2015 11:46:17 +0200
Subject: [PATCH] Removing a child should also unset its parent

---
 .../minecraft/gui/container/AbstractGuiContainer.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
index a5862fe0..889e6696 100644
--- a/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
+++ b/src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
@@ -114,8 +114,11 @@ public abstract class AbstractGuiContainer<T extends AbstractGuiContainer<T>>
 
     @Override
     public T removeElement(GuiElement element) {
-        if (elements.remove(element) != null && layedOutElements != null) {
-            layedOutElements.remove(element);
+        if (elements.remove(element) != null) {
+            element.setContainer(null);
+            if (layedOutElements != null) {
+                layedOutElements.remove(element);
+            }
         }
         return getThis();
     }