Merge branch 'quality_assurance' of https://bitbucket.org/projectswg/holocore into CORE-137-travel

Conflicts:
	src/resources/objects/SWGObject.java
	src/resources/objects/creature/CreatureObject.java
	src/utilities/IntentFactory.java
This commit is contained in:
Mads Boddum
2015-10-25 08:14:34 +01:00
85 changed files with 118794 additions and 85441 deletions
+6
View File
@@ -163,6 +163,12 @@ public class Packet {
public static void addData(ByteBuffer bb, byte[] data) {
bb.put(data);
}
public static void addArray(ByteBuffer bb, byte[] data) {
bb.order(ByteOrder.LITTLE_ENDIAN);
addShort(bb, data.length);
addData(bb, data);
}
public static void addArrayList(ByteBuffer bb, byte[] b) {
addShort(bb, b.length);