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 'experimental'

Browse Source 
Conflicts:
	src/resources/objects/waypoint/WaypointObject.java
This commit is contained in:
Obique
2014-08-16 00:59:18 -05:00
parent dbec5fd321 14ab6f13b0
commit 36190aefe4
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/waypoint/WaypointObject.java
+10 -11
View File
@@ -154,17 +154,16 @@ public class WaypointObject extends IntangibleObject implements IDelta, Serializ
}
public synchronized byte[] getBytes() {
IoBuffer buffer = Baseline.createBuffer(38 + StringUtilities.getUnicodeString(getName()).length);
buffer.putInt(getCellNumber());
buffer.put(Baseline.toBytes(getBaseline(3).get("position")));
buffer.putLong(getTargetId());
buffer.putInt(getPlanetCrc());
buffer.put(StringUtilities.getUnicodeString(getName()));
buffer.putLong(getObjectID());
buffer.put(getColor());
buffer.put(Baseline.getBoolean(isActive()));
return buffer.flip().array();
IoBuffer buffer = Baseline.createBuffer(38 + StringUtilities.getUnicodeString(getName()).length);
buffer.putInt(getCellNumber());
buffer.put(Baseline.toBytes(getBaseline(3).get("position")));
buffer.putLong(getTargetId());
buffer.putInt(getPlanetCrc());
buffer.put(StringUtilities.getUnicodeString(getName()));
buffer.putLong(getObjectID());
buffer.put(getColor());
buffer.put(Baseline.getBoolean(isActive()));
return buffer.flip().array();
}
@Deprecated public int getCellId() { return getCellNumber(); }
src/services/PlayerService.java
+1 -1
View File
@@ -526,7 +526,7 @@ public class PlayerService implements INetworkDispatch {
});
swgOpcodes.put(Opcodes.CmdSceneReady, (session, data) -> {
session.setAttribute("CmdSceneReady", true);
});
/*swgOpcodes.put(Opcodes.ExpertiseRequestMessage, new INetworkRemoteEvent() {