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

Refactored abilities, skillSvc sends less traffic

Browse Source
This commit is contained in:
Treeku
2014-06-04 14:56:19 +01:00
parent 850e23cd5e
commit 9ac995796a
3 changed files with 28 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+19 -42
View File
@@ -95,8 +95,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
private float turnRadius = 1;
private float walkSpeed = (float) 1.549;
private float waterModPercent = (float) 0.75;
private SWGList<String> abilities;
private int abilitiesUpdateCounter = 0;
private SWGMap<String, Integer> abilities;
private int xpBarValue = 0;
private SWGMap<Long, Long> missionCriticalObjects;
@@ -193,7 +192,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
loadTemplateData();
skills = new ArrayList<String>();
skillMods = new SWGMap<String, SkillMod>(this, 4, 3, true);
abilities = new SWGList<String>(this, 4, 14, true);
abilities = new SWGMap<String, Integer>(this, 4, 14, true);
missionCriticalObjects = new SWGMap<Long, Long>(this, 4, 13, false);
equipmentList = new SWGList<Long>(this, 6, 23, false);
buffList = new SWGList<Buff>(this, 6, 26, false);
@@ -786,60 +785,29 @@ public class CreatureObject extends TangibleObject implements Serializable {
this.waterModPercent = waterModPercent;
}
}
public SWGList<String> getAbilities() {
public SWGMap<String, Integer> getAbilities() {
return abilities;
}
public boolean hasAbility(String name) {
for (String ability : abilities) {
if (ability.equals(name)) {
return true;
}
}
return false;
return abilities.containsKey(name);
}
public int getAbilitiesUpdateCounter() {
synchronized(objectMutex) {
return abilitiesUpdateCounter;
}
}
public void setAbilitiesUpdateCounter(int abilitiesUpdateCounter) {
synchronized(objectMutex) {
this.abilitiesUpdateCounter = abilitiesUpdateCounter;
}
}
public void addAbility(String abilityName) {
if(abilities.contains(abilityName))
if (abilities.containsKey(abilityName)) {
return;
abilities.add(abilityName);
if(getClient() != null) {
setAbilitiesUpdateCounter((short) (getAbilitiesUpdateCounter() + 1));
getClient().getSession().write(messageBuilder.buildAddAbilityDelta(abilityName));
}
abilities.put(abilityName, 1);
}
public void removeAbility(String abilityName) {
if(!abilities.contains(abilityName))
if (!abilities.containsKey(abilityName)) {
return;
abilities.remove(abilityName);
if(getClient() != null) {
setAbilitiesUpdateCounter((short) (getAbilitiesUpdateCounter() + 1));
getClient().getSession().write(messageBuilder.buildRemoveAbilityDelta(abilityName));
}
abilities.remove(abilityName);
}
public SWGMap<Long, Long> getMissionCriticalObjects() {
@@ -1862,6 +1830,15 @@ public class CreatureObject extends TangibleObject implements Serializable {
getClient().getSession().write(buffer);
}
break;
}
case 14: {
buffer = messageBuilder.createDelta("CREO", (byte) 4, (short) 1, (byte) 14, buffer, buffer.array().length + 4);
if (getClient() != null && getClient().getSession() != null) {
getClient().getSession().write(buffer);
}
break;
}
}