From 57bb88bc17109724ebdbe6f0469d6879dbbf3e1e Mon Sep 17 00:00:00 2001
From: Alejandro <25-alejandro@users.noreply.git.krews.org>
Date: Sat, 18 May 2019 16:44:12 +0300
Subject: [PATCH] Prevent group join button reappearing after guild update

---
 src/main/java/com/eu/habbo/habbohotel/rooms/Room.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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<Room>, ISerialize, Runnable
     {
         if(guild.getRoomId() == this.id)
         {
-            THashMap<Integer, GuildMember> admins = Emulator.getGameEnvironment().getGuildManager().getOnlyAdmins(guild);
+            THashSet<GuildMember> 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<GuildMember> 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()));
             }
         }