projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15: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/creature/CreatureObject.java
+17 -3
View File
@@ -50,13 +50,12 @@ import com.sleepycat.persist.model.NotPersistent;
import main.NGECore;
import engine.clients.Client;
import resources.buffs.Buff;
import resources.buffs.DamageOverTime;
import resources.common.Cooldown;
import resources.common.OutOfBand;
import resources.objects.Buff;
import resources.objects.DamageOverTime;
import resources.objects.SWGList;
import resources.objects.SWGMap;
import resources.objects.SkillMod;
import engine.resources.common.CRC;
import engine.resources.objects.IPersistent;
import engine.resources.objects.MissionCriticalObject;
@@ -66,6 +65,7 @@ import engine.resources.scene.Point3D;
import engine.resources.scene.Quaternion;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.skills.SkillMod;
import services.command.BaseSWGCommand;
@Entity(version=9)
@@ -189,6 +189,8 @@ public class CreatureObject extends TangibleObject implements Serializable {
private transient ConcurrentHashMap<String, Long> cooldowns = new ConcurrentHashMap<String, Long>();
@NotPersistent
private transient long tefTime = System.currentTimeMillis();
@NotPersistent
private transient SWGObject useTarget;
public CreatureObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
super(objectID, planet, Template, position, orientation);
@@ -983,6 +985,18 @@ public class CreatureObject extends TangibleObject implements Serializable {
notifyObservers(messageBuilder.buildIntendedTargetDelta(intendedTarget), true);
}
public SWGObject getUseTarget() {
synchronized(objectMutex) {
return useTarget;
}
}
public void setUseTarget(SWGObject useTarget) {
synchronized(objectMutex) {
this.useTarget = useTarget;
}
}
public long getTargetId() {
return getIntendedTarget();
}