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

Merge holocore/quality_assurance into expertise_training

Browse Source 
Conflicts:
	src/services/experience/SkillService.java
	src/services/experience/SkillTemplateService.java
	src/services/player/CharacterCreationService.java
This commit is contained in:
Mads Boddum
2016-10-29 08:09:36 +02:00
parent 730632f9bc 07eb924bd4
commit 8bc33ac932
56 changed files with 2632 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+5 -4
View File
@@ -29,6 +29,7 @@ package resources.objects.creature;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
import java.util.Locale;
import java.util.Map;
@@ -42,7 +43,6 @@ import network.packets.swg.zone.baselines.Baseline.BaselineType;
import network.packets.swg.zone.object_controller.PostureUpdate;
import resources.HologramColour;
import resources.Posture;
import resources.PvpFaction;
import resources.PvpFlag;
import resources.PvpStatus;
import resources.Race;
@@ -87,6 +87,7 @@ public class CreatureObject extends TangibleObject {
public CreatureObject(long objectId) {
super(objectId, BaselineType.CREO);
initBaseAttributes();
setPrefLoadRange(200);
}
@Override
@@ -132,7 +133,7 @@ public class CreatureObject extends TangibleObject {
public boolean addSkill(String skillName) {
synchronized(skills) {
if(skills.add(skillName)) {
if (skills.add(skillName)) {
skills.sendDeltaMessage(this);
return true;
}
@@ -145,8 +146,8 @@ public class CreatureObject extends TangibleObject {
return skills.contains(skillName);
}
public SWGSet<String> getSkills() {
return skills;
public Set<String> getSkills() {
return Collections.unmodifiableSet(skills);
}
public int getCashBalance() {