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

Fixed equipping and unequipping for observers

Browse Source
This commit is contained in:
Obique PSWG
2016-05-25 12:46:44 -05:00
parent 9dcd8b7740
commit 50ab1dd891
3 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+12 -11
View File
@@ -132,7 +132,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
* Adds the specified object to this object and places it in the appropriate slot if needed
* @param object Object to add to this container, which will either be put into the appropriate slot(s) or become a contained object
*/
public boolean addObject(SWGObject object) {
public void addObject(SWGObject object) {
// If the arrangement is -1, then this object will be a contained object
int arrangementId = getArrangementId(object);
if (arrangementId == -1) {
@@ -157,7 +157,6 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
synchronized (object.objectsAware) {
object.objectsAware.clear();
}
return true;
}
/**
@@ -211,8 +210,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
Player newOwner = null;
if (container != null) {
if (!container.addObject(this))
Log.e("SWGObject", "Failed adding " + this + " to " + container);
container.addObject(this);
newOwner = container.getOwner();
}
@@ -257,9 +255,8 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
}
} else {
// Item is going into slot(s)
Map<String, SWGObject> containerSlots = container.getSlots();
for (String slotName : getArrangement().get(arrangementId - 4)) {
SWGObject equippedItem = containerSlots.get(slotName);
SWGObject equippedItem = container.getSlottedObject(slotName);
if (equippedItem != null) {
equippedItem.moveToContainer(requester, container.getSlottedObject("inventory"));
}
@@ -301,6 +298,8 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
break;
}
}
if (parent != null)
return parent.hasPermission(object, permissions);
return true;
}
@@ -715,7 +714,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
public void createObject(Player target, boolean ignoreSnapshotChecks) {
if (!hasPermission(target.getCreatureObject(), ContainerPermissions.Permission.VIEW)) {
// Log.i("SWGObject", target.getCreatureObject() + " doesn't have permission to view " + this + " -- skipping packet sending");
// Log.i("SWGObject", target.getCreatureObject() + " doesn't have permission to view " + this + " -- skipping packet sending");
return;
}
@@ -804,13 +803,13 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
Player owner = getOwner();
SWGObject parent = getParent();
if (parent == null)
return getObservers(owner, true);
return getObservers(owner, this, true);
while (parent.getParent() != null)
parent = parent.getParent();
return parent.getObservers(owner, true);
return parent.getObservers(owner, this, true);
}
private Set<SWGObject> getObservers(Player owner, boolean initial) {
private Set<SWGObject> getObservers(Player owner, SWGObject original, boolean initial) {
Set<SWGObject> nearby;
synchronized (containedObjects) {
nearby = new HashSet<>(containedObjects.values());
@@ -826,10 +825,12 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
continue;
if (awareOwner.getPlayerState() != PlayerState.ZONED_IN)
continue;
if (!original.hasPermission(aware, ContainerPermissions.Permission.VIEW))
continue;
if (((CreatureObject) aware).isLoggedInPlayer())
observers.add(aware);
} else
observers.addAll(aware.getObservers(owner, false));
observers.addAll(aware.getObservers(owner, original, false));
}
return observers;
}