projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-01 16:12:53 -04:00
Code Issues Projects Releases Wiki Activity

Fixed a potential entertainer effect crash.

Browse Source
This commit is contained in:
Treeku
2014-09-03 12:17:26 +01:00
parent 99448e05a9
commit 33c9617430
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/protocol/swg/PlayClientEffectObjectMessage.java
+9 -22
View File
@@ -26,13 +26,12 @@ import java.nio.ByteOrder;
import org.apache.mina.core.buffer.IoBuffer;
public class PlayClientEffectObjectMessage extends SWGMessage {
private long objectId;
private String effectFile;
private String commandString;
public PlayClientEffectObjectMessage(String effectFile, long objectId, String commandString) {
this.effectFile = effectFile;
this.objectId = objectId;
this.commandString = commandString;
@@ -40,33 +39,21 @@ public class PlayClientEffectObjectMessage extends SWGMessage {
@Override
public IoBuffer serialize() {
IoBuffer result = IoBuffer.allocate(20 + effectFile.length() + commandString.length()).order(ByteOrder.LITTLE_ENDIAN);
int size = 20 + effectFile.length() + commandString.length() + ((effectFile.startsWith("clienteffect/holoemote_") ? commandString.length() : 0);
IoBuffer result = IoBuffer.allocate(size).order(ByteOrder.LITTLE_ENDIAN);
result.putShort((short) 5);
result.putInt(0x8855434A);
result.put(getAsciiString(effectFile));
if(!effectFile.startsWith("clienteffect/holoemote_"))
{
result.putShort((short) 0); // Because waverunner is a dweeb
result.putLong(objectId);
result.put(getAsciiString(commandString));
}
else
{
result.put(getAsciiString(commandString));
result.putLong(objectId);
}
result.put(getAsciiString(effectFile.startsWith("clienteffect/holoemote_") ? commandString : ""));
result.putLong(objectId);
result.put(getAsciiString(commandString));
return result.flip();
}
@Override
public void deserialize(IoBuffer data) {
// TODO Auto-generated method stub
}
}