From 79b02b80a6b4c49dbed409b3efa2645b9ab1b53f Mon Sep 17 00:00:00 2001 From: Alejandro <25-alejandro@users.noreply.git.krews.org> Date: Sun, 11 Aug 2019 12:15:39 +0300 Subject: [PATCH] Fix guild admin removing --- .../messages/incoming/guilds/GuildRemoveAdminEvent.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java index 84bbb3fa..a26dbcc5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveAdminEvent.java @@ -22,19 +22,20 @@ public class GuildRemoveAdminEvent extends MessageHandler { int userId = this.packet.readInt(); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId()); - Emulator.getGameEnvironment().getGuildManager().removeAdmin(guild, userId); + Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); - Habbo habbo = room.getHabbo(userId); GuildRemovedAdminEvent removedAdminEvent = new GuildRemovedAdminEvent(guild, userId, habbo); Emulator.getPluginManager().fireEvent(removedAdminEvent); if (removedAdminEvent.isCancelled()) return; + Emulator.getGameEnvironment().getGuildManager().removeAdmin(guild, userId); + if (habbo != null) { habbo.getClient().sendResponse(new GuildInfoComposer(guild, this.client, false, Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild.getId(), userId))); - room.refreshRightsForHabbo(habbo); + if (room != null && habbo.getHabboInfo().getCurrentRoom() != null && habbo.getHabboInfo().getCurrentRoom() == room) room.refreshRightsForHabbo(habbo); } GuildMember guildMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guildId, userId);