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

Small refactor for WaypointObject

Browse Source
This commit is contained in:
Waverunner
2015-02-08 13:06:30 -05:00
parent b09dca9189
commit 6d6cdab7d3
1 changed files with 3 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/waypoint/WaypointObject.java
+3 -40
View File
@@ -4,7 +4,6 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import resources.common.CRC;
import resources.network.BaselineBuilder;
import resources.network.BaselineBuilder.Encodable;
import resources.objects.intangible.IntangibleObject;
import resources.player.Player;
@@ -15,7 +14,6 @@ public class WaypointObject extends IntangibleObject implements Encodable{
private static final long serialVersionUID = 1L;
private int cellNumber;
private long targetId = 0;
private String name = "New Waypoint";
private WaypointColor color = WaypointColor.BLUE;
private boolean active = true;
@@ -34,17 +32,6 @@ public class WaypointObject extends IntangibleObject implements Encodable{
this.cellNumber = cellNumber;
}
public long getTargetId() {
return targetId;
}
public void setTargetId(long targetId) {
this.targetId = targetId;
}
public String getName() {
return name;
}
@@ -74,34 +61,10 @@ public class WaypointObject extends IntangibleObject implements Encodable{
this.active = active;
}
public void createBaseline3(Player target, BaselineBuilder bb) {
super.createBaseline3(target, bb);
bb.addInt(cellNumber);
bb.addFloat((float) getLocation().getX());
bb.addFloat((float) getLocation().getY());
bb.addFloat((float) getLocation().getZ());
bb.addLong(targetId); // unsure when this is anything but 0, have yet to see it change
bb.addInt(getLocation().getTerrain().getCrc());
bb.addUnicode(name);
bb.addByte(color.getValue());
bb.addBoolean(active);
}
protected void createObject(Player target) {
// NOTE: Client is never sent a WAYP baseline in NGE, WaypointObject's just go inside the Waypoint List in PLAY.
/*super.sendSceneCreateObject(target);
BaselineBuilder bb = new BaselineBuilder(this, BaselineType.WAYP, 3);
createBaseline3(target, bb);
bb.sendTo(target);
createChildrenObjects(target);
target.sendPacket(new SceneEndBaselines(getObjectId()));*/
}
@Override
public byte[] encode() {
ByteBuffer bb = ByteBuffer.allocate(42 + name.length() * 2).order(ByteOrder.LITTLE_ENDIAN);
@@ -109,8 +72,8 @@ public class WaypointObject extends IntangibleObject implements Encodable{
bb.putFloat((float) getLocation().getX());
bb.putFloat((float) 0);
bb.putFloat((float) getLocation().getZ());
bb.putLong(targetId); // unsure when this is anything but 0, have yet to see it change
bb.putInt(CRC.getCrc("tatooine")); // TODO: Add method to terrain's to just get planet name instead of file name
bb.putLong(0); // Network id, used for clusters
bb.putInt(CRC.getCrc(getLocation().getTerrain().getName()));
bb.put(Encoder.encodeUnicode(name));
bb.putLong(getObjectId());
bb.put((byte) color.getValue());
@@ -121,7 +84,7 @@ public class WaypointObject extends IntangibleObject implements Encodable{
public enum WaypointColor{
BLUE(1), GREEN(2), ORANGE(3), YELLOW(4), PURPLE(5), WHITE(6), MULTICOLOR(7);
int i;
private int i;
private WaypointColor(int i) {
this.i = i;