From 8521ae73accc9560f9278b28a030233933e9b766 Mon Sep 17 00:00:00 2001 From: Skyler Lehan Date: Tue, 12 Jul 2016 19:35:35 -0400 Subject: [PATCH 1/2] NGE-111: fixed an issue with %TT being sent instead of the proper message, and temp fix to passing leadership --- src/resources/objects/group/GroupObject.java | 6 +++++- src/services/group/GroupService.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/resources/objects/group/GroupObject.java b/src/resources/objects/group/GroupObject.java index 8ae864ff5..0e3461a32 100644 --- a/src/resources/objects/group/GroupObject.java +++ b/src/resources/objects/group/GroupObject.java @@ -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); } diff --git a/src/services/group/GroupService.java b/src/services/group/GroupService.java index a28929d59..98405401d 100644 --- a/src/services/group/GroupService.java +++ b/src/services/group/GroupService.java @@ -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; From 6de3955439b92e10c1a43d7c37625737be7f631f Mon Sep 17 00:00:00 2001 From: Skyler Lehan Date: Thu, 14 Jul 2016 17:26:10 -0400 Subject: [PATCH 2/2] Removing comment --- src/resources/objects/group/GroupObject.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/resources/objects/group/GroupObject.java b/src/resources/objects/group/GroupObject.java index 0e3461a32..31ec2de25 100644 --- a/src/resources/objects/group/GroupObject.java +++ b/src/resources/objects/group/GroupObject.java @@ -151,7 +151,6 @@ 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)); }