From f2aa2af65a8c830f5b99de978212570d871c61f3 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Fri, 27 May 2016 12:06:56 -0500
Subject: [PATCH] Fixed equipping/unequipping inside buildings

---
 src/resources/objects/SWGObject.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 5722b8969..b3e24e624 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -298,8 +298,6 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 					break;
 			}
 		}
-		if (parent != null)
-			return parent.hasPermission(object, permissions);
 		return true;
 	}
 
@@ -844,14 +842,14 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 		}
 		Set<SWGObject> observers = new HashSet<>();
 		for (SWGObject aware : nearby) {
+			if (!aware.hasPermission(original, ContainerPermissions.Permission.VIEW))
+				continue;
 			if (aware instanceof CreatureObject) {
 				Player awareOwner = aware.getOwner();
 				if (awareOwner == null || awareOwner.equals(owner))
 					continue;
 				if (awareOwner.getPlayerState() != PlayerState.ZONED_IN)
 					continue;
-				if (!original.hasPermission(aware, ContainerPermissions.Permission.VIEW))
-					continue;
 				if (((CreatureObject) aware).isLoggedInPlayer())
 					observers.add(aware);
 			} else