nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-06-28 11:45:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
ArpyAge 2022-03-27 16:06:25 +02:00
commit 36f7004b91
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sqlupdates/3_0_0 to 3_0_1.sql
View File

@ -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');

2
src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java
View File

@ -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) {

2
src/main/java/com/eu/habbo/habbohotel/commands/EmptyInventoryCommand.java
View File

@ -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 {

2
src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewEvent.java
View File

@ -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) {

6
src/main/java/com/eu/habbo/messages/incoming/rooms/bots/BotSaveSettingsEvent.java
View File

@ -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;

2
src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoodLightSaveSettingsEvent.java
View File

@ -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;
}