From e304ba1ecb36524518e68347191ab8bd9aa99055 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 23 Mar 2022 03:27:50 -0400 Subject: [PATCH 1/5] Revert change to EmptyInventoryCommand --- .../com/eu/habbo/habbohotel/commands/EmptyInventoryCommand.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/EmptyInventoryCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/EmptyInventoryCommand.java index a7a205a8..66af755a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EmptyInventoryCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EmptyInventoryCommand.java @@ -42,6 +42,8 @@ public class EmptyInventoryCommand extends Command { Emulator.getThreading().run(new QueryDeleteHabboItems(items)); habbo.getClient().sendResponse(new InventoryRefreshComposer()); + habbo.getClient().sendResponse(new InventoryItemsComposer(0, 1, gameClient.getHabbo().getInventory().getItemsComponent().getItems())); + gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_empty.cleared").replace("%username%", habbo.getHabboInfo().getUsername()), RoomChatMessageBubbles.ALERT); } else { From b668bfd99a2d5484025d92fb78dfba64fef43301 Mon Sep 17 00:00:00 2001 From: dank074 Date: Wed, 23 Mar 2022 03:15:25 -0500 Subject: [PATCH 2/5] add moodlight color config --- sqlupdates/3_0_0 to 3_0_1.sql | 3 +++ .../incoming/rooms/items/MoodLightSaveSettingsEvent.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sqlupdates/3_0_0 to 3_0_1.sql b/sqlupdates/3_0_0 to 3_0_1.sql index 248827a8..e48d67a3 100644 --- a/sqlupdates/3_0_0 to 3_0_1.sql +++ b/sqlupdates/3_0_0 to 3_0_1.sql @@ -80,3 +80,6 @@ ALTER TABLE `permissions` ADD COLUMN `acc_calendar_force` enum('0','1') NULL DEF ALTER TABLE `permissions` ADD `cmd_update_calendar` ENUM('0', '1') NOT NULL DEFAULT '0'; INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('commands.description.cmd_update_calendar', ':update_calendar'), ('commands.keys.cmd_update_calendar', 'update_calendar'); INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('commands.success.cmd_update_calendar', 'Calendar updated successfully!'); + +-- add moodlight configuration +INSERT INTO `emulator_settings` (`key`, `value`) VALUES ('moodlight.color_check.enabled', '1'); \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java index 731e6490..894e83c9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java @@ -30,7 +30,7 @@ public class MoodLightSaveSettingsEvent extends MessageHandler { int brightness = this.packet.readInt(); boolean apply = this.packet.readBoolean(); - if (!MOODLIGHT_AVAILABLE_COLORS.contains(color)) { + if (Emulator.getConfig().getBoolean("moodlight.color_check.enabled", true) && !MOODLIGHT_AVAILABLE_COLORS.contains(color)) { ScripterManager.scripterDetected(this.client, "User tried to set a moodlight to a non-whitelisted color: " + color); return; } From 208c07a809701c167b1df10f9984ad35fae72b11 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 23 Mar 2022 04:43:39 -0400 Subject: [PATCH 3/5] Add bot motto max length to match user --- .../messages/incoming/rooms/bots/BotSaveSettingsEvent.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java index 2d217924..bb5da19d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java @@ -152,7 +152,11 @@ public class BotSaveSettingsEvent extends MessageHandler { } break; case 9: - bot.setMotto(this.packet.readString()); + String motto = this.packet.readString(); + + if(motto.length() > Emulator.getConfig().getInt("motto.max_length", 38)) break; + + bot.setMotto(motto); bot.needsUpdate(true); room.sendComposer(new RoomUsersComposer(bot).compose()); break; From 8eacb5b977272c9a7db1cf3423b40be4082a86a8 Mon Sep 17 00:00:00 2001 From: brenoepics <59066707+brenoepics@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:50:32 -0300 Subject: [PATCH 4/5] Update CalendarRewardClaimed.java --- .../habbohotel/campaign/calendar/CalendarRewardClaimed.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java b/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java index 3cc0c56d..7b6a1837 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java @@ -16,7 +16,7 @@ public class CalendarRewardClaimed { this.campaign = set.getInt("campaign_id"); this.day = set.getInt("day"); this.reward_id = set.getInt("reward_id"); - this.timestamp = set.getTimestamp("timestamp"); + this.timestamp = new Timestamp(set.getInt("timestamp") * 1000L); } public CalendarRewardClaimed(int user_id, int campaign, int day, int reward_id, Timestamp timestamp) { From b0b213cfb3864fe38d3859b2053e040dfaf39c30 Mon Sep 17 00:00:00 2001 From: brenoepics <59066707+brenoepics@users.noreply.github.com> Date: Wed, 23 Mar 2022 18:20:27 -0300 Subject: [PATCH 5/5] Fix doorbell --- .../eu/habbo/messages/incoming/hotelview/HotelViewEvent.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java index a1560542..67dddaa3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java @@ -3,6 +3,7 @@ package com.eu.habbo.messages.incoming.hotelview; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.messages.incoming.MessageHandler; +import com.eu.habbo.messages.outgoing.hotelview.HotelViewComposer; public class HotelViewEvent extends MessageHandler { @Override @@ -21,6 +22,7 @@ public class HotelViewEvent extends MessageHandler { } else { this.client.getHabbo().getHabboInfo().setRoomQueueId(0); } + this.client.sendResponse(new HotelViewComposer()); } if (this.client.getHabbo().getRoomUnit() != null) {