Merge remote-tracking branch 'origin/master' into Invasions

This commit is contained in:
CharonInferar
2014-08-10 14:28:41 +02:00
17 changed files with 203 additions and 205 deletions
@@ -207,6 +207,9 @@ public class CreatureObject extends TangibleObject implements Serializable {
public CreatureObject() {
super();
messageBuilder = new CreatureMessageBuilder(this);
System.out.println("Name: " + getCustomName());
System.out.println(" Cash Credits: " + cashCredits);
System.out.println(" Bank Credits: " + bankCredits);
}
@Override
@@ -224,6 +227,7 @@ public class CreatureObject extends TangibleObject implements Serializable {
missionCriticalObjects.init(this);
abilities.init(this);
skillMods.init(this);
skills.init(this);
}
private void loadTemplateData() {