diff --git a/src/resources/objects/group/GroupObject.java b/src/resources/objects/group/GroupObject.java index fc97006eb..11f3f7a90 100644 --- a/src/resources/objects/group/GroupObject.java +++ b/src/resources/objects/group/GroupObject.java @@ -41,8 +41,8 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.Map; @@ -194,9 +194,9 @@ public class GroupObject extends SWGObject { // Extends INTO or TANO? return members; } - public ArrayList getGroupMemberObjects() { + public HashSet getGroupMemberObjects() { - ArrayList memberObjects = new ArrayList<>(); + HashSet memberObjects = new HashSet<>(); synchronized (groupMembers) { diff --git a/src/services/group/GroupService.java b/src/services/group/GroupService.java index 76523702a..b4793b7fb 100644 --- a/src/services/group/GroupService.java +++ b/src/services/group/GroupService.java @@ -50,6 +50,7 @@ import utilities.IntentFactory; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Timer; @@ -421,7 +422,7 @@ public class GroupService extends Service { private void sendGroupSystemMessage(GroupObject group, String id) { - ArrayList members = group.getGroupMemberObjects(); + HashSet members = group.getGroupMemberObjects(); for (CreatureObject member : members) { new ChatBroadcastIntent(member.getOwner(), new ProsePackage("group", id)).broadcast();