diff --git a/sqlupdates/2_4_0-RC-2 to 2_4_0.sql b/sqlupdates/2_4_0-RC-2 to 2_4_0.sql new file mode 100644 index 00000000..ea380bc0 --- /dev/null +++ b/sqlupdates/2_4_0-RC-2 to 2_4_0.sql @@ -0,0 +1,3 @@ +-- Adds config value for max amount of people to move per roller. Default is like habbo. +INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('hotel.room.rollers.roll_avatars.max', '1'); +INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('hotel.nux.gifts.enabled', '0'); diff --git a/src/main/java/com/eu/habbo/core/consolecommands/ConsoleCommand.java b/src/main/java/com/eu/habbo/core/consolecommands/ConsoleCommand.java index 23604f3e..ea103623 100644 --- a/src/main/java/com/eu/habbo/core/consolecommands/ConsoleCommand.java +++ b/src/main/java/com/eu/habbo/core/consolecommands/ConsoleCommand.java @@ -23,6 +23,7 @@ public abstract class ConsoleCommand { addCommand(new ConsoleReconnectCameraCommand()); addCommand(new ShowInteractionsCommand()); addCommand(new ShowRCONCommands()); + addCommand(new ThankyouArcturusCommand()); } public static void addCommand(ConsoleCommand command) { diff --git a/src/main/java/com/eu/habbo/core/consolecommands/ThankyouArcturusCommand.java b/src/main/java/com/eu/habbo/core/consolecommands/ThankyouArcturusCommand.java new file mode 100644 index 00000000..64378af5 --- /dev/null +++ b/src/main/java/com/eu/habbo/core/consolecommands/ThankyouArcturusCommand.java @@ -0,0 +1,43 @@ +package com.eu.habbo.core.consolecommands; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ThankyouArcturusCommand extends ConsoleCommand { + private static final Logger LOGGER = LoggerFactory.getLogger(ThankyouArcturusCommand.class); + + public ThankyouArcturusCommand() { + super("thankyou", "A thankyou message."); + } + + @Override + public void handle(String[] args) throws Exception { + LOGGER.info("Arcturus Morningstar is an opensource community fork of Arcturus Emulator by TheGeneral"); + LOGGER.info("Thankyou to the following people who have helped with it's development:"); + LOGGER.info("TheGeneral - For Creating Arcturus."); + LOGGER.info("Capheus - Decompilation"); + LOGGER.info("Beny - Lead Developer"); + LOGGER.info("Alejandro - Lead Developer"); + LOGGER.info("Harmonic - Developer"); + LOGGER.info("ArpyAge - Developer"); + LOGGER.info("Mike - Developer"); + LOGGER.info("Skeletor - Developer"); + LOGGER.info("zGrav - Developer"); + LOGGER.info("Swirny - Developer"); + LOGGER.info("Quadral - Developer"); + LOGGER.info("Dome - Developer"); + LOGGER.info("Necmi - Developer"); + LOGGER.info("Oliver - Support"); + LOGGER.info("Rasmus - Support"); + LOGGER.info("Layne - Support"); + LOGGER.info("Bill - Support"); + LOGGER.info("Harmony - Support"); + LOGGER.info("Ridge - Catalogue"); + LOGGER.info("Tenshie - Catalogue"); + LOGGER.info("Wulles - Catalogue"); + LOGGER.info("Gizmo - Catalogue"); + LOGGER.info("TheJava - Motivation"); + LOGGER.info("The Entire Krews.org Community."); + } + } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/PickNewUserGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/PickNewUserGiftEvent.java index 24530532..979e6ac8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/PickNewUserGiftEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/PickNewUserGiftEvent.java @@ -14,7 +14,7 @@ public class PickNewUserGiftEvent extends MessageHandler { int index = this.packet.readInt(); if (!Emulator.getPluginManager().fireEvent(new UserPickGiftEvent(this.client.getHabbo(), keyA, keyB, index)).isCancelled()) { - if (!this.client.getHabbo().getHabboStats().nuxReward) { + if (!this.client.getHabbo().getHabboStats().nuxReward && Emulator.getConfig().getBoolean("hotel.nux.gifts.enabled")){ this.client.getHabbo().getHabboStats().nuxReward = true; NewUserGift gift = Emulator.getGameEnvironment().getItemManager().getNewUserGift(index + 1);