From 3ffee0aa4c1dc33fda6120df8d2f7717968de1c4 Mon Sep 17 00:00:00 2001 From: ArpyAge Date: Sun, 5 Sep 2021 13:43:19 +0200 Subject: [PATCH] Ability to change guild settings while not in a room --- .../incoming/guilds/GuildChangeSettingsEvent.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeSettingsEvent.java index 2cb2d807..d21df54b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildChangeSettingsEvent.java @@ -17,11 +17,6 @@ public class GuildChangeSettingsEvent extends MessageHandler { if (guild != null) { if (guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN)) { - Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId()); - - if (room == null) - return; - GuildChangedSettingsEvent settingsEvent = new GuildChangedSettingsEvent(guild, this.packet.readInt(), this.packet.readInt() == 0); Emulator.getPluginManager().fireEvent(settingsEvent); @@ -31,7 +26,10 @@ public class GuildChangeSettingsEvent extends MessageHandler { guild.setState(GuildState.valueOf(settingsEvent.state)); guild.setRights(settingsEvent.rights); - room.refreshGuild(guild); + Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId()); + if(room != null) { + room.refreshGuild(guild); + } guild.needsUpdate = true;