Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

src/resources/objects/player/PlayerMessageBuilder.java

@@ -598,6 +598,21 @@ public class PlayerMessageBuilder extends ObjectMessageBuilder {
 		return buffer;
 	}
 	
+	public IoBuffer buildFlagBitmask(int bitmask) {
+		IoBuffer buffer = bufferPool.allocate(30, false).order(ByteOrder.LITTLE_ENDIAN);
+		buffer.putInt(4);
+		buffer.putInt(bitmask);
+		buffer.putInt(0);
+		buffer.putInt(0);
+		buffer.putInt(0);
+		
+		int size = buffer.position();
+		buffer.flip();
+		
+		buffer = createDelta("PLAY", (byte) 3, (short) 1, (short) 5, buffer, size + 4);
+		return buffer;
+	}
+	
 	@Override
 	public void sendListDelta(byte viewType, short updateType, IoBuffer buffer) {
 		// TODO Auto-generated method stub

src/resources/objects/player/PlayerObject.java

@@ -56,6 +56,7 @@ public class PlayerObject extends IntangibleObject {
 	private int totalPlayTime = 0;
 	private byte[] collections = new byte[] { };
 	private int highestSetBit = 0;
+	private int flagBitmask = 0;
 	
 	// PLAY 6
 	
@@ -658,4 +659,38 @@ public class PlayerObject extends IntangibleObject {
 		}
 	}
 	
+	public int getFlagBitmask() {
+		synchronized(objectMutex) {
+			return flagBitmask;
+		}
+	}
+
+	public void setFlagBitmask(int flagBitmask) {
+		synchronized(objectMutex) {
+			this.flagBitmask |= flagBitmask;
+		}
+
+		if (getContainer() != null) {
+			getContainer().notifyObservers(messageBuilder.buildFlagBitmask(this.flagBitmask), true);
+		}
+	}
+	public void clearFlagBitmask(int flagBitmask) {
+		synchronized(objectMutex) {
+			// set flag bitmask to 0
+			this.flagBitmask &= ~flagBitmask;
+		}
+
+		if (getContainer() != null) {
+			getContainer().notifyObservers(messageBuilder.buildFlagBitmask(this.flagBitmask), true);
+		}
+	}
+	
+	public void toggleFlag(int flag) {
+		if ((this.flagBitmask & flag) == flag) {
+			clearFlagBitmask(flag);
+		} else {
+			setFlagBitmask(flag);
+		}
+	}
+	
 }