From 8e9cea8f83010c1bee43f0bac3a907301eb0e17a Mon Sep 17 00:00:00 2001
From: brenoepic <59066707+brenoepics@users.noreply.github.com>
Date: Fri, 29 Apr 2022 18:30:04 -0300
Subject: [PATCH] Fix NPE "member" is nullable here.

---
 .../guilds/GetMemberGuildItemCountEvent.java   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java
index 4a5d77a0..7202ada6 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java
@@ -17,17 +17,17 @@ public class GetMemberGuildItemCountEvent extends MessageHandler {
 
         Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId);
 
-        if (guild != null) {
-            GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo());
-            if (userId == this.client.getHabbo().getHabboInfo().getId() || guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || (member != null && member.getRank().equals(GuildRank.OWNER) || member.getRank().equals(GuildRank.ADMIN)) || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN)) {
-                Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(guild.getRoomId());
-                int count = 0;
-                if (room != null) {
-                    count = room.getUserFurniCount(userId);
-                }
-                this.client.sendResponse(new GuildMemberFurniCountInHQMessageComposer(userId, count));
+        if (guild == null) return;
+        GuildMember member = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo());
+        if (userId == this.client.getHabbo().getHabboInfo().getId() || guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || (member != null && (member.getRank().equals(GuildRank.OWNER) || member.getRank().equals(GuildRank.ADMIN))) || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN)) {
+            Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(guild.getRoomId());
+            int count = 0;
+            if (room != null) {
+                count = room.getUserFurniCount(userId);
             }
+            this.client.sendResponse(new GuildMemberFurniCountInHQMessageComposer(userId, count));
         }
 
+
     }
 }