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

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	src/protocol/swg/ObjControllerMessage.java
	src/resources/objects/player/PlayerMessageBuilder.java
	src/services/travel/TravelService.java
This commit is contained in:
Light2
2014-03-10 00:42:19 +01:00
parent 807025ec0b 41d8fcf841
commit 52136c2b36
182 changed files with 2439 additions and 10372 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/player/PlayerObject.java
+30 -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=3)
@Persistent(version=5)
public class PlayerObject extends IntangibleObject {
// PLAY 3
@@ -116,6 +117,9 @@ public class PlayerObject extends IntangibleObject {
private int jediState = 0; // unused in NGE
private String biography = "";
private String spouse;
@NotPersistent
private PlayerMessageBuilder messageBuilder;
@@ -228,6 +232,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) {
@@ -342,6 +348,9 @@ public class PlayerObject extends IntangibleObject {
synchronized(objectMutex) {
this.professionWheelPosition = professionWheelPosition;
}
if (getContainer() != null && getContainer().getClient() != null && getContainer().getClient().getSession() != null) {
getContainer().getClient().getSession().write(messageBuilder.buildProfessionWheelPositionDelta(professionWheelPosition));
}
}
public int getExperimentationFlag() {
@@ -664,6 +673,26 @@ public class PlayerObject extends IntangibleObject {
}
}
public String getBiography() {
return biography;
}
public void setBiography(String biography) {
synchronized(objectMutex) {
this.biography = biography;
}
}
public String getSpouseName() {
return spouse;
}
public void setSpouseName(String spouse) {
synchronized(objectMutex) {
this.spouse = spouse;
}
}
public int getFlagBitmask() {
synchronized(objectMutex) {
return flagBitmask;