diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java index 319d371a..cf5e9b98 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java @@ -35,7 +35,7 @@ public class KickMemberEvent extends MessageHandler { guild.decreaseMemberCount(); if (userId != this.client.getHabbo().getHabboInfo().getId()) { - this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild)); + this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild, userId)); } Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(guild.getRoomId()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java index 3534f488..a21621cd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java @@ -27,7 +27,7 @@ public class RejectMembershipRequestEvent extends MessageHandler { guild.decreaseRequestCount(); Emulator.getGameEnvironment().getGuildManager().removeMember(guild, userId); this.client.sendResponse(new GuildMembersComposer(guild, Emulator.getGameEnvironment().getGuildManager().getGuildMembers(guild, 0, 0, ""), this.client.getHabbo(), 0, 0, "", true, Emulator.getGameEnvironment().getGuildManager().getGuildMembersCount(guild, 0, 0, ""))); - this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild)); + this.client.sendResponse(new GuildMembershipRejectedMessageComposer(guild, userId)); Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); Emulator.getPluginManager().fireEvent(new GuildDeclinedMembershipEvent(guild, userId, habbo, this.client.getHabbo())); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java index 2e3c6867..51799655 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembershipRejectedMessageComposer.java @@ -7,16 +7,18 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuildMembershipRejectedMessageComposer extends MessageComposer { private final Guild guild; + private final Integer userId; - public GuildMembershipRejectedMessageComposer(Guild guild) { + public GuildMembershipRejectedMessageComposer(Guild guild, int userId) { this.guild = guild; + this.userId = userId; } @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildMembershipRejectedMessageComposer); this.response.appendInt(this.guild.getId()); - this.response.appendInt(0); + this.response.appendInt(this.userId); return this.response; } }