Added xp gain on killing NPCs, fixed some bugs, added 2 new config options

This commit is contained in:
Light2
2014-03-26 23:37:10 +01:00
parent d1a7f20177
commit c3772e3246
27 changed files with 228 additions and 208 deletions
@@ -1085,7 +1085,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
}
public void removeObjectFromEquipList(SWGObject object) {
if(object instanceof TangibleObject) {
if(object instanceof TangibleObject && equipmentList.contains(object)) {
setEquipmentListUpdateCounter(getEquipmentListUpdateCounter() + 1);
notifyObservers(messageBuilder.buildRemoveEquipmentDelta((TangibleObject) object), true);
equipmentList.get().remove(object);
@@ -1101,7 +1101,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
}
public void removeObjectFromAppearanceEquipList(SWGObject object) {
if(object instanceof TangibleObject) {
if(object instanceof TangibleObject && appearanceEquipmentList.contains(object)) {
setAppearanceEquipmentListUpdateCounter(getAppearanceEquipmentListUpdateCounter() + 1);
notifyObservers(messageBuilder.buildRemoveAppearanceEquipmentDelta((TangibleObject) object), true);
appearanceEquipmentList.get().remove(object);