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

Conflicts:
	scripts/radial/vehicle.py
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/SimulationService.java
	src/services/combat/CombatService.java
	src/services/object/ObjectService.java

src/resources/objects/player/PlayerObject.java

@@ -44,7 +44,7 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent(version=11)
+@Persistent(version=13)
 public class PlayerObject extends IntangibleObject {
 	
 	// PLAY 3
@@ -142,6 +142,8 @@ public class PlayerObject extends IntangibleObject {
 	
 	private byte godLevel = 0;
 	
+	private List<Integer> chatChannels = new ArrayList<Integer>();
+	
 	@NotPersistent
 	private boolean callingCompanion = false;
 	
@@ -867,6 +869,27 @@ public class PlayerObject extends IntangibleObject {
 		}
 	}
 	
+	public List<Integer> getJoinedChatChannels() {
+		return chatChannels;
+	}
+	
+	public void addChannel(int roomId) {
+		chatChannels.add(roomId);
+	}
+	
+	public void removeChannel(int roomId) {
+		chatChannels.remove(roomId);
+	}
+	
+	public boolean isMemberOfChannel(int roomId) {
+		if (chatChannels.contains(roomId)) {
+			System.out.println("Member of the channel!");
+			return true;
+		}
+		System.out.println("Not a Member of the channel!");
+		return false;
+	}
+	
 	public boolean isCallingCompanion() {
 		return callingCompanion;
 	}