From a095dff3cd6d0a417b3ea5fac58d7b44cb9ede55 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Fri, 29 Jan 2016 01:20:30 +0100 Subject: [PATCH] Finished StopClientEffectObjectByLabelMessage --- .../StopClientEffectObjectByLabelMessage.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/network/packets/swg/zone/spatial/StopClientEffectObjectByLabelMessage.java b/src/network/packets/swg/zone/spatial/StopClientEffectObjectByLabelMessage.java index d4f065d32..16eb0de2c 100644 --- a/src/network/packets/swg/zone/spatial/StopClientEffectObjectByLabelMessage.java +++ b/src/network/packets/swg/zone/spatial/StopClientEffectObjectByLabelMessage.java @@ -35,36 +35,40 @@ public class StopClientEffectObjectByLabelMessage extends SWGPacket { public static final int CRC = getCrc("StopClientEffectObjectByLabelMessage"); private long objectId; - private String effect; + private String label; + private boolean softStop; public StopClientEffectObjectByLabelMessage() { } - public StopClientEffectObjectByLabelMessage(long objectId, String effect) { + public StopClientEffectObjectByLabelMessage(long objectId, String label, boolean softStop) { this.objectId = objectId; - this.effect = effect; + this.label = label; + this.softStop = softStop; } public StopClientEffectObjectByLabelMessage(ByteBuffer data) { decode(data); } + @Override public void decode(ByteBuffer data) { if (!super.decode(data, CRC)) return; objectId = getLong(data); - effect = getAscii(data); - getByte(data); + label = getAscii(data); + softStop = getBoolean(data); } + @Override public ByteBuffer encode() { - ByteBuffer data = ByteBuffer.allocate(6); + ByteBuffer data = ByteBuffer.allocate(Short.BYTES * 2 + Integer.BYTES + Long.BYTES + label.length()); addShort(data, 4); addInt (data, CRC); addLong (data, objectId); - addAscii(data, effect); - addByte (data, 1); + addAscii(data, label); + addBoolean(data, softStop); return data; }