From e62973f5d19217c728e05ee9aa511ea092fbd6a5 Mon Sep 17 00:00:00 2001 From: Remco Date: Tue, 2 Feb 2021 18:18:08 +0100 Subject: [PATCH 1/3] Mannequin save look event now checks for acc_anyroomowner --- .../incoming/rooms/items/MannequinSaveLookEvent.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java index 5def4dee..4e46eb30 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java @@ -1,16 +1,19 @@ package com.eu.habbo.messages.incoming.rooms.items; import com.eu.habbo.Emulator; +import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; +import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.messages.incoming.MessageHandler; public class MannequinSaveLookEvent extends MessageHandler { @Override public void handle() throws Exception { - Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); + Habbo habbo = this.client.getHabbo(); + Room room = habbo.getHabboInfo().getCurrentRoom(); - if (room == null || this.client.getHabbo().getHabboInfo().getId() != room.getOwnerId()) + if (room == null || !room.isOwner(habbo)) return; HabboItem item = room.getHabboItem(this.packet.readInt()); From f186420abe1dcd61f7d1c9805813e8efcaf72190 Mon Sep 17 00:00:00 2001 From: Remco Date: Tue, 2 Feb 2021 18:21:02 +0100 Subject: [PATCH 2/3] Mannequin save look event now checks for acc_anyroomowner --- .../incoming/rooms/items/MannequinSaveLookEvent.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java index 4e46eb30..6713af89 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MannequinSaveLookEvent.java @@ -1,7 +1,6 @@ package com.eu.habbo.messages.incoming.rooms.items; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; @@ -25,7 +24,7 @@ public class MannequinSaveLookEvent extends MessageHandler { StringBuilder look = new StringBuilder(); - for (String s : this.client.getHabbo().getHabboInfo().getLook().split("\\.")) { + for (String s : habbo.getHabboInfo().getLook().split("\\.")) { if (!s.contains("hr") && !s.contains("hd") && !s.contains("he") && !s.contains("ea") && !s.contains("ha") && !s.contains("fa")) { look.append(s).append("."); } @@ -36,9 +35,9 @@ public class MannequinSaveLookEvent extends MessageHandler { } if (data.length == 3) { - item.setExtradata(this.client.getHabbo().getHabboInfo().getGender().name().toLowerCase() + ":" + look + ":" + data[2]); + item.setExtradata(habbo.getHabboInfo().getGender().name().toLowerCase() + ":" + look + ":" + data[2]); } else { - item.setExtradata(this.client.getHabbo().getHabboInfo().getGender().name().toLowerCase() + ":" + look + ":" + this.client.getHabbo().getHabboInfo().getUsername() + "'s look."); + item.setExtradata(habbo.getHabboInfo().getGender().name().toLowerCase() + ":" + look + ":" + habbo.getHabboInfo().getUsername() + "'s look."); } item.needsUpdate(true); From 5398a04b479f5d1057249798dae33098a1be1e28 Mon Sep 17 00:00:00 2001 From: Thijmen Stavenuiter Date: Mon, 8 Mar 2021 15:04:40 +0100 Subject: [PATCH 3/3] Don't send the page if HC condition is not met. --- .../eu/habbo/habbohotel/catalog/CatalogManager.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java index cac81c5b..1d2a4f34 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java @@ -649,7 +649,17 @@ public class CatalogManager { this.catalogPages.get(parentId).childPages.forEachValue(new TObjectProcedure() { @Override public boolean execute(CatalogPage object) { - if (object.getRank() <= habbo.getHabboInfo().getRank().getId() && object.visible) { + + boolean isVisiblePage = object.visible; + boolean hasRightRank = object.getRank() <= habbo.getHabboInfo().getRank().getId(); + + boolean clubRightsOkay = true; + + if(object.isClubOnly() && !habbo.getHabboInfo().getHabboStats().hasActiveClub()) { + clubRightsOkay = false; + } + + if (isVisiblePage && hasRightRank && clubRightsOkay) { pages.add(object); }