Fixed various bugs

This commit is contained in:
Treeku
2014-05-12 04:56:29 +01:00
parent 9b4272e434
commit 4fe246975c
12 changed files with 71 additions and 115 deletions
@@ -212,14 +212,13 @@ public class CreatureObject extends TangibleObject implements Serializable {
cooldowns = new ConcurrentHashMap<String, Long>();
performanceAudience = new Vector<CreatureObject>();
messageBuilder = new CreatureMessageBuilder(this);
dotList.init();
buffList.init();
equipmentList.init();
appearanceEquipmentList.init();
missionCriticalObjects.init();
abilities.init();
skillMods.init();
skillMods.forEach((name, skillMod) -> skillMod.init());
dotList.init(this);
buffList.init(this);
equipmentList.init(this);
appearanceEquipmentList.init(this);
missionCriticalObjects.init(this);
abilities.init(this);
skillMods.init(this);
}
private void loadTemplateData() {
@@ -1554,20 +1553,6 @@ public class CreatureObject extends TangibleObject implements Serializable {
if(getClient() != null)
getClient().getSession().write(messageBuilder.buildListenToId(performanceListenee.getObjectId()));
}
@Override
public void setPvPBitmask(int pvpBitmask) {
super.setPvPBitmask(pvpBitmask);
notifyObservers(new UpdatePVPStatusMessage(getObjectID(), getPvPBitmask(), getFaction()), false);
}
@Override
public void setPvpStatus(int pvpBitmask, boolean add) {
super.setPvpStatus(pvpBitmask, add);
notifyObservers(new UpdatePVPStatusMessage(getObjectID(), getPvPBitmask(), getFaction()), false);
}
public byte getDifficulty() {
synchronized(objectMutex) {