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

Merge branch 'master' into darkk_ent

Browse Source 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
This commit is contained in:
darkk1138
2013-12-07 16:37:52 +01:00
parent 9683f4c164 21943d1934
commit 131092de60
129 changed files with 2348 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureMessageBuilder.java
+12 -2
View File
@@ -370,8 +370,9 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
buffer.putInt(1);
}
buffer.putShort((short) 0);
buffer.put((byte) 0);
buffer.put(creature.getDifficulty());
buffer.putInt(0xFFFFFFFF);
buffer.put((byte) 1);
buffer.putShort((short) 0);
@@ -1023,6 +1024,15 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
}
public IoBuffer buildDifficultyDelta(byte difficulty) {
IoBuffer buffer = bufferPool.allocate(1, false).order(ByteOrder.LITTLE_ENDIAN);
buffer.put(difficulty);
int size = buffer.position();
buffer.flip();
buffer = createDelta("CREO", (byte) 6, (short) 1, (short) 0x1C, buffer, size + 4);
return buffer;
}
@Override
public void sendListDelta(byte viewType, short updateType, IoBuffer buffer) {
// TODO Auto-generated method stub