projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-30 00:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Added CharacterSheetResponseMessage, added spouseName variable to PlayerObject

Browse Source
This commit is contained in:
Waverunner
2014-03-09 11:52:08 -04:00
parent 1ded9e9aac
commit b31ed75912
3 changed files with 99 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/player/PlayerObject.java
+15 -1
View File
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import resources.common.Console;
import resources.objects.intangible.IntangibleObject;
import resources.objects.waypoint.WaypointObject;
@@ -41,7 +42,7 @@ import engine.resources.scene.Planet;
import engine.resources.scene.Point3D;
import engine.resources.scene.Quaternion;
@Persistent(version=4)
@Persistent(version=5)
public class PlayerObject extends IntangibleObject {
// PLAY 3
@@ -117,6 +118,7 @@ public class PlayerObject extends IntangibleObject {
private int jediState = 0; // unused in NGE
private String biography = "";
private String spouse;
@NotPersistent
private PlayerMessageBuilder messageBuilder;
@@ -229,6 +231,8 @@ public class PlayerObject extends IntangibleObject {
synchronized(objectMutex) {
xpExists = xpList.containsKey(type);
xpList.put(type, amount);
Console.println("Put " + type + " exp of " + amount + " in the map.");
Console.println("Map is now: " + xpList.get(type).intValue());
}
if (getContainer() != null && getContainer().getClient() != null && getContainer().getClient().getSession() != null) {
@@ -679,6 +683,16 @@ public class PlayerObject extends IntangibleObject {
}
}
public String getSpouseName() {
return spouse;
}
public void setSpouseName(String spouse) {
synchronized(objectMutex) {
this.spouse = spouse;
}
}
public int getFlagBitmask() {
synchronized(objectMutex) {
return flagBitmask;