Fixed #308 and added foundation work for chat channels

This commit is contained in:
Waverunner
2014-03-29 16:47:05 -04:00
parent ac2f2e1e17
commit dfab6ac265
17 changed files with 668 additions and 17 deletions
+14 -2
View File
@@ -39,6 +39,7 @@ public class GroupObject extends UniverseObject {
private short groupLevel;
private int lootMode;
private GroupMessageBuilder messageBuilder;
private int chatRoomId;
public GroupObject(long objectId) {
super(objectId, null, new Point3D(0, 0, 0), new Quaternion(1, 0, 0, 0), "object/group/shared_group_object.iff");
@@ -108,7 +109,19 @@ public class GroupObject extends UniverseObject {
this.lootMode = lootMode;
}
}
public int getChatRoomId() {
synchronized(objectMutex) {
return chatRoomId;
}
}
public void setChatRoomId(int chatRoomId) {
synchronized(objectMutex) {
this.chatRoomId = chatRoomId;
}
}
public void addMember(SWGObject member) {
if(memberList.size() >= 8 || member.getClient() == null)
@@ -147,5 +160,4 @@ public class GroupObject extends UniverseObject {
destination.getSession().write(messageBuilder.buildBaseline6());
}
}