projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-08 23:13:25 -04:00
Code Issues Projects Releases Wiki Activity

Merged quality_assurance into buffs

Browse Source
This commit is contained in:
Mads Boddum
2016-01-20 11:53:52 +01:00
parent 9d624a9564 fb9140a8d5
commit b198ef0417
117 changed files with 142843 additions and 128891 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+30 -12
View File
@@ -60,8 +60,9 @@ public class CreatureObject extends TangibleObject {
private static final long serialVersionUID = 3L;
private transient GroupInviterData inviterData = new GroupInviterData(0, null, "", 0);
private transient long lastReserveOperation = 0;
private transient GroupInviterData inviterData = new GroupInviterData(0, null, "", 0);
private transient long lastReserveOperation = 0;
private transient long groupId = 0;
private Posture posture = Posture.UPRIGHT;
private Race race = Race.HUMAN;
@@ -98,12 +99,12 @@ public class CreatureObject extends TangibleObject {
private boolean performing = false;
private boolean shownOnRadar = true;
private boolean beast = false;
private long groupId = 0;
private byte factionRank = 0;
private long ownerId = 0;
private int battleFatigue = 0;
private long statesBitmask = 0;
private String currentCity = "";
private long lastTransform = 0;
private HologramColour hologramColour = HologramColour.DEFAULT;
private SWGList<Integer> baseAttributes = new SWGList<Integer>(BaselineType.CREO, 1, 2);
@@ -130,7 +131,10 @@ public class CreatureObject extends TangibleObject {
private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
ois.defaultReadObject();
// Transient Variables
inviterData = new GroupInviterData(0, null, "", 0);
lastReserveOperation = 0;
groupId = 0;
}
public void removeEquipment(SWGObject obj) {
@@ -277,14 +281,31 @@ public class CreatureObject extends TangibleObject {
return currentCity;
}
public double getTimeSinceLastTransform() {
return (System.nanoTime()-lastTransform)/1E6;
}
public PlayerObject getPlayerObject() {
return (PlayerObject) (hasSlot("ghost") ? getSlottedObject("ghost") : null);
return (PlayerObject) getSlottedObject("ghost");
}
public boolean isPlayer() {
return getSlottedObject("ghost") != null;
}
public boolean isLoggedInPlayer() {
return getOwner() != null && isPlayer();
}
public boolean isLoggedOutPlayer() {
return getOwner() == null && isPlayer();
}
public void setPosture(Posture posture) {
this.posture = posture;
sendDelta(3, 13, posture.getId());
sendObserversAndSelf(new PostureUpdate(getObjectId(), posture));
if (isPlayer())
sendObserversAndSelf(new PostureUpdate(getObjectId(), posture));
}
public void setRace(Race race) {
@@ -442,6 +463,10 @@ public class CreatureObject extends TangibleObject {
this.currentCity = currentCity;
}
public void updateLastTransformTime() {
lastTransform = System.nanoTime();
}
public String getMoodAnimation() {
return moodAnimation;
}
@@ -939,11 +964,4 @@ public class CreatureObject extends TangibleObject {
super.createBaseline9(target, bb);
}
public void sendDelta(int type, int update, Object value) {
sendDelta(BaselineType.CREO, type, update, value);
}
public void sendDelta(int type, int update, Object value, StringType strType) {
sendDelta(BaselineType.CREO, type, update, value, strType);
}
}