NGE-111: fixed an issue with %TT being sent instead of the proper message, and temp fix to passing leadership

This commit is contained in:
Skyler Lehan
2016-07-12 19:35:35 -04:00
parent c1b4460208
commit 8521ae73ac
2 changed files with 7 additions and 3 deletions
+5 -1
View File
@@ -41,6 +41,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -150,13 +151,16 @@ public class GroupObject extends SWGObject { // Extends INTO or TANO?
private void changeLeader(GroupMember member) {
if (groupMembers.size() > 0) {
synchronized (groupMembers) {
GroupMember previous = groupMembers.set(0, member);
//GroupMember previous = groupMembers.set(0, member);
// TODO: need to account for group member order of joining
Collections.swap(groupMembers, 0, groupMembers.indexOf(member));
}
} else {
this.addMember(member.getCreatureObject());
}
this.leader = member.getId();
groupMembers.sendDeltaMessage(this);
}