projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-06 21:13:37 -04:00
Code Issues Projects Releases Wiki Activity

Fixed equipping/unequipping inside buildings

Browse Source
This commit is contained in:
Obique PSWG
2016-05-27 12:06:56 -05:00
parent 928b6185ab
commit f2aa2af65a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+2 -4
View File
@@ -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