projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-16 06:12:52 -04:00
Code Issues Projects Releases Wiki Activity

Merged in slehan/holocore/groups (pull request #238)

Browse Source 
Added temp fix to keep testing groups
This commit is contained in:
Obique PSWG
2016-07-15 10:38:19 -05:00
parent ffe3797d39 6de3955439
commit 610bde20cf
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/group/GroupObject.java
+4 -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,15 @@ 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);
// 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);
}
src/services/group/GroupService.java
+2 -2
View File
@@ -280,9 +280,9 @@ public class GroupService extends Service {
}
if (target.getInviterData().getId() != 0) {
if (target.getInviterData().getId() != inviter.getCreatureObject().getGroupId())
sendSystemMessage(inviter, "considering_other_group");
sendSystemMessage(inviter, "considering_other_group", "TT", target.getObjectId());
else
sendSystemMessage(inviter, "considering_your_group");
sendSystemMessage(inviter, "considering_your_group", "TT", target.getObjectId());
}
return true;