projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-15 23:05:45 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #241 from madsboddum/74

Browse Source 
If the group leader leaves, the group is notified of who becomes the leader #74
This commit is contained in:
Josh Larson
2020-07-05 00:05:23 -04:00
committed by GitHub
parent b31cb3e04c 43bc02ca9e
commit 9912546e7c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/projectswg/holocore/resources/support/objects/swg/group/GroupObject.java
View File

@@ -100,9 +100,6 @@ public class GroupObject extends SWGObject {
}
public void removeMember(CreatureObject creature) {
if (leader.equals(creature) && size() >= 2) {
setLeader(groupMembers.get(1));
}
removeGroupMembers(creature);
calculateLevel();
}

10
src/main/java/com/projectswg/holocore/services/gameplay/player/group/GroupService.java
View File

@@ -417,6 +417,16 @@ public class GroupService extends Service {
sendSystemMessage(creature.getOwner(), "removed");
group.removeMember(creature);
updateChatRoom(creature.getOwner(), group, UpdateType.LEAVE);
// If the leader has left, promote another group member to leader and notify the group of this
if (creature.getObjectId() == group.getLeaderId()) {
CreatureObject newLeader = group.getGroupMemberObjects().iterator().next(); // Pick a new leader
group.setLeader(newLeader);
sendGroupSystemMessage(group, "new_leader", "TU", newLeader.getObjectName());
}
}
private void updateChatRoom(Player player, GroupObject group, UpdateType updateType) {