From dbfc89c1601079f1227bcabdeb62acf9b5f4da67 Mon Sep 17 00:00:00 2001 From: Obique Date: Mon, 11 Aug 2014 00:17:51 -0500 Subject: [PATCH 1/2] Set a session variable for determining if the client is ready for updates --- src/services/PlayerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index 71944c7b..fb2ef276 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -525,7 +525,7 @@ public class PlayerService implements INetworkDispatch { }); swgOpcodes.put(Opcodes.CmdSceneReady, (session, data) -> { - + session.setAttribute("CmdSceneReady", true); }); /*swgOpcodes.put(Opcodes.ExpertiseRequestMessage, new INetworkRemoteEvent() { From 5ea48e1c2e7e4904d75410571748a182d5b7b3d5 Mon Sep 17 00:00:00 2001 From: Obique Date: Mon, 11 Aug 2014 00:18:27 -0500 Subject: [PATCH 2/2] Fixed a null pointer exception due to objectMutex being null --- .../objects/waypoint/WaypointObject.java | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/resources/objects/waypoint/WaypointObject.java b/src/resources/objects/waypoint/WaypointObject.java index 8dd5337d..cbf48ff2 100644 --- a/src/resources/objects/waypoint/WaypointObject.java +++ b/src/resources/objects/waypoint/WaypointObject.java @@ -153,19 +153,17 @@ public class WaypointObject extends IntangibleObject implements IDelta, Serializ } - public byte[] getBytes() { - synchronized(objectMutex) { - 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(); - } + 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(); } @Deprecated public int getCellId() { return getCellNumber(); }