Merge branch 'development' of bitbucket.org:projectswg/holocore into development

This commit is contained in:
Obique
2015-05-21 23:12:48 -05:00
11 changed files with 149 additions and 24 deletions
@@ -147,7 +147,14 @@ public class CreatureObject extends TangibleObject {
for(String slotName : slotNameList)
container.setSlot(slotName, null);
}
public void removeEquipment(SWGObject obj) {
synchronized (equipmentList) {
if (equipmentList.remove(obj))
equipmentList.sendDeltaMessage(this);
}
}
public void addEquipment(SWGObject obj) {
synchronized(equipmentList) {
if (obj instanceof WeaponObject)