projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-28 13:12:54 -04:00
Code Issues Projects Releases Wiki Activity

Merge conflict resolve

Browse Source
This commit is contained in:
CharonInferar
2014-08-09 18:17:01 +02:00
parent 79d56ca4ef a8a824b8a7
commit 0f8466bf44
1452 changed files with 14987 additions and 14349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/protocol/swg/objectControllerObjects/ObjectMenuDirty.java
+1 -9
View File
@@ -25,10 +25,6 @@ import java.nio.ByteOrder;
import org.apache.mina.core.buffer.IoBuffer;
import protocol.swg.ObjControllerMessage;
public class ObjectMenuDirty extends ObjControllerObject {
private long characterId;
@@ -37,13 +33,11 @@ public class ObjectMenuDirty extends ObjControllerObject {
this.characterId = characterId;
}
@Override
public void deserialize(IoBuffer buffer) {
}
@Override
public IoBuffer serialize() {
IoBuffer result = IoBuffer.allocate(45).order(ByteOrder.LITTLE_ENDIAN);
@@ -58,6 +52,4 @@ public class ObjectMenuDirty extends ObjControllerObject {
// 0000: 05 00 46 5E CE 80 1B 00 00 00 2B 02 00 00 7C 0E ..F^......+...|.
// 0010: 31 D6 41 00 00 00 00 00 00 00 1.A.......
}