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

Fixed multiple attachments not decoding properly for OutOfBandPackage's and fixed WaypointCmdCallback exceptions on certain cases

Browse Source 
Added cellId to WaypointObject
This commit is contained in:
Waverunner
2015-06-20 10:09:07 -04:00
parent 29f1d73b67
commit 6366c0b208
3 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/waypoint/WaypointObject.java
+15 -21
View File
@@ -45,7 +45,7 @@ public class WaypointObject extends IntangibleObject implements OutOfBandPackage
private static final long serialVersionUID = 1L;
private int cellNumber;
private long cellId;
private String name = "New Waypoint";
private WaypointColor color = WaypointColor.BLUE;
private boolean active = true;
@@ -54,44 +54,38 @@ public class WaypointObject extends IntangibleObject implements OutOfBandPackage
super(objectId, BaselineType.WAYP);
}
public int getCellNumber() {
return cellNumber;
}
public void setCellNumber(int cellNumber) {
this.cellNumber = cellNumber;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public WaypointColor getColor() {
return color;
}
public void setColor(WaypointColor color) {
this.color = color;
}
public boolean isActive() {
return active;
}
public void setActive(boolean active) {
this.active = active;
}
public long getCellId() {
return cellId;
}
public void setCellId(long cellId) {
this.cellId = cellId;
}
public void createObject(Player target) {
// NOTE: Client is never sent a WAYP baseline in NGE, WaypointObject's just go inside the Waypoint List in PLAY.
}
@@ -100,11 +94,11 @@ public class WaypointObject extends IntangibleObject implements OutOfBandPackage
public byte[] encode() {
Location loc = getLocation();
ByteBuffer bb = ByteBuffer.allocate(42 + name.length() * 2).order(ByteOrder.LITTLE_ENDIAN);
bb.putInt(cellNumber);
bb.putInt(0);
bb.putFloat((float) loc.getX());
bb.putFloat((float) loc.getY());
bb.putFloat((float) loc.getZ());
bb.putLong(0);
bb.putLong(cellId);
bb.putInt(CRC.getCrc(loc.getTerrain().getName()));
bb.put(Encoder.encodeUnicode(name));
bb.putLong(getObjectId());
@@ -130,7 +124,7 @@ public class WaypointObject extends IntangibleObject implements OutOfBandPackage
data.getInt(); // -3
data.getInt();
setLocation(data.getFloat(), data.getFloat(), data.getFloat());
data.getLong();
cellId = data.getLong();
getLocation().setTerrain(Terrain.getTerrainFromCrc(data.getInt()));
name = Packet.getUnicode(data);
data.getLong();
@@ -145,14 +139,14 @@ public class WaypointObject extends IntangibleObject implements OutOfBandPackage
return false;
if (o instanceof WaypointObject) {
WaypointObject wp = (WaypointObject) o;
return wp.name.equals(name) && wp.cellNumber == cellNumber && wp.color == color && wp.active == active;
return wp.name.equals(name) && wp.cellId == cellId && wp.color == color && wp.active == active;
}
return false;
}
@Override
public int hashCode() {
return ((super.hashCode() * 7 + name.hashCode()) * 13 + color.getValue()) * 17 + cellNumber;
return ((super.hashCode() * 7 + name.hashCode()) * 13 + color.getValue()) * 17 + (int) cellId;
}
@Override