From 10a3ddfddd4f25685a0fae97116e4fcc6ae03c68 Mon Sep 17 00:00:00 2001
From: Waverunner <lewaverunner@gmail.com>
Date: Thu, 28 May 2015 15:36:12 -0400
Subject: [PATCH] Fixed object destruction not updating the client

---
 src/services/objects/ObjectManager.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 1f1398ee..96489e82 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -253,10 +253,12 @@ public class ObjectManager extends Manager {
 			if (parent instanceof CreatureObject) {
 				((CreatureObject) parent).removeEquipment(object);
 			}
-			parent.removeObject(object);
-		}
+			object.sendObserversAndSelf(new SceneDestroyObject(objId));
 
-		object.sendObservers(new SceneDestroyObject(objId));
+			parent.removeObject(object);
+		} else {
+			object.sendObservers(new SceneDestroyObject(objId));
+		}
 
 		// Finally, remove from the awareness tree
 		deleteObject(object.getObjectId());