diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java index 271382c8..b4898da6 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildAcceptMembershipEvent.java @@ -29,7 +29,9 @@ public class GuildAcceptMembershipEvent extends MessageHandler { if (guild != null) { GuildMember groupMember = Emulator.getGameEnvironment().getGuildManager().getGuildMember(guild, this.client.getHabbo()); - if (userId == this.client.getHabbo().getHabboInfo().getId() || guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() || groupMember.getRank().equals(GuildRank.ADMIN) || groupMember.getRank().equals(GuildRank.OWNER) || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN)) { + if (guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId() + || this.client.getHabbo().hasPermission(Permission.ACC_GUILD_ADMIN) + || (groupMember != null && (groupMember.getRank().equals(GuildRank.ADMIN) || groupMember.getRank().equals(GuildRank.OWNER)))) { if (habbo != null) { if (habbo.getHabboStats().hasGuild(guild.getId())) { this.client.sendResponse(new GuildAcceptMemberErrorComposer(guild.getId(), GuildAcceptMemberErrorComposer.ALREADY_ACCEPTED)); diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java index 24d9898a..214b49df 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildSetAdminEvent.java @@ -11,6 +11,11 @@ import com.eu.habbo.messages.outgoing.guilds.GuildMemberUpdateComposer; import com.eu.habbo.plugin.events.guilds.GuildGivenAdminEvent; public class GuildSetAdminEvent extends MessageHandler { + @Override + public int getRatelimit() { + return 500; + } + @Override public void handle() throws Exception { int guildId = this.packet.readInt(); diff --git a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java index ae021b5c..5ca0d1b4 100644 --- a/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java +++ b/Emulator/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GuildForumPostThreadEvent.java @@ -48,7 +48,7 @@ public class GuildForumPostThreadEvent extends MessageHandler { if (threadId == 0) { if (!((guild.canPostThreads().state == 0) - || (guild.canPostThreads().state == 1 && member != null) + || (guild.canPostThreads().state == 1 && member != null && member.getRank().type <= GuildRank.MEMBER.type) || (guild.canPostThreads().state == 2 && member != null && (member.getRank().type < GuildRank.MEMBER.type)) || (guild.canPostThreads().state == 3 && guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId()) || isStaff)) { @@ -87,7 +87,7 @@ public class GuildForumPostThreadEvent extends MessageHandler { } if (!((guild.canPostMessages().state == 0) - || (guild.canPostMessages().state == 1 && member != null) + || (guild.canPostMessages().state == 1 && member != null && member.getRank().type <= GuildRank.MEMBER.type) || (guild.canPostMessages().state == 2 && member != null && (member.getRank().type < GuildRank.MEMBER.type)) || (guild.canPostMessages().state == 3 && guild.getOwnerId() == this.client.getHabbo().getHabboInfo().getId()) || isStaff)) { diff --git a/Latest_Compiled_Version/Habbo-4.1.2-jar-with-dependencies.jar b/Latest_Compiled_Version/Habbo-Latest.jar similarity index 93% rename from Latest_Compiled_Version/Habbo-4.1.2-jar-with-dependencies.jar rename to Latest_Compiled_Version/Habbo-Latest.jar index c60617de..6c6bf754 100644 Binary files a/Latest_Compiled_Version/Habbo-4.1.2-jar-with-dependencies.jar and b/Latest_Compiled_Version/Habbo-Latest.jar differ