diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java index b499c6f0..b800d9a7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -5095,12 +5095,15 @@ public class Room implements Comparable, ISerialize, Runnable { if(guild.getRoomId() == this.id) { - THashMap admins = Emulator.getGameEnvironment().getGuildManager().getOnlyAdmins(guild); + THashSet members = Emulator.getGameEnvironment().getGuildManager().getGuildMembers(guild.getId()); for (Habbo habbo : this.getHabbos()) { - GuildMember member = admins.get(habbo.getHabboInfo().getId()); - habbo.getClient().sendResponse(new GuildInfoComposer(guild, habbo.getClient(), false, member)); + Optional member = members.stream().filter(m -> m.getUserId() == habbo.getHabboInfo().getId()).findAny(); + + if (!member.isPresent()) continue; + + habbo.getClient().sendResponse(new GuildInfoComposer(guild, habbo.getClient(), false, member.get())); } }