projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-29 14:12:52 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	.gitignore
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/mission/MissionObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/chat/Mail.java
	src/services/mission/MissionObjective.java
	src/services/object/ObjectService.java
	src/services/playercities/PlayerCity.java
This commit is contained in:
Light2
2014-05-01 21:08:20 +02:00
parent 62593b08de 12ca3ae661
commit 536b51d953
379 changed files with 5722 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/mission/MissionObject.java
+23 -3
View File
@@ -28,6 +28,7 @@ import com.sleepycat.je.Transaction;
import com.sleepycat.persist.model.NotPersistent;
import com.sleepycat.persist.model.Persistent;
import resources.common.BountyListItem;
import resources.objects.intangible.IntangibleObject;
import resources.objects.waypoint.WaypointObject;
import services.mission.MissionObjective;
@@ -56,8 +57,11 @@ public class MissionObject extends IntangibleObject implements Serializable {
private String type = "";
private int missionTemplateObject = 0;
private WaypointObject attachedWaypoint;
// Server variables
private MissionObjective objective;
private long bountyObjId;
@NotPersistent
private transient MissionMessageBuilder messageBuilder = new MissionMessageBuilder(this);
@@ -148,11 +152,15 @@ public class MissionObject extends IntangibleObject implements Serializable {
}
public void setMissionDescription(String missionDescription) {
setMissionDescription(missionDescription, "");
}
public void setMissionDescription(String missionDescription, String additionalParam) {
synchronized(objectMutex) {
this.description = missionDescription;
}
if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) {
getGrandparent().getClient().getSession().write(messageBuilder.buildMissionDescriptionDelta(missionDescription, missionId));
getGrandparent().getClient().getSession().write(messageBuilder.buildMissionDescriptionDelta(missionDescription, missionId, additionalParam));
}
}
@@ -163,11 +171,15 @@ public class MissionObject extends IntangibleObject implements Serializable {
}
public void setMissionTitle(String missionTitle) {
setMissionTitle(missionTitle, "");
}
public void setMissionTitle(String missionTitle, String additionalParam) {
synchronized(objectMutex) {
this.title = missionTitle;
}
if (getGrandparent() != null && getGrandparent().getClient() != null && getGrandparent().getClient().getSession() != null) {
getGrandparent().getClient().getSession().write(messageBuilder.buildMissionTitleDelta(missionTitle, missionId));
getGrandparent().getClient().getSession().write(messageBuilder.buildMissionTitleDelta(missionTitle, missionId, additionalParam));
}
}
@@ -286,6 +298,14 @@ public class MissionObject extends IntangibleObject implements Serializable {
this.missionId = missionId;
}
public long getBountyObjId() {
return bountyObjId;
}
public void setBountyObjId(long bountyObjId) {
this.bountyObjId = bountyObjId;
}
@Override
public void sendBaselines(Client destination) {