diff --git a/src/main/java/com/eu/habbo/core/Easter.java b/src/main/java/com/eu/habbo/core/Easter.java index cc5431d7..40b57a6c 100644 --- a/src/main/java/com/eu/habbo/core/Easter.java +++ b/src/main/java/com/eu/habbo/core/Easter.java @@ -12,8 +12,8 @@ import com.eu.habbo.plugin.events.users.UserSavedMottoEvent; public class Easter { @EventHandler public static void onUserChangeMotto(UserSavedMottoEvent event) { - if (Emulator.getConfig().getBoolean("easter_eggs.enabled") && event.newMotto.equalsIgnoreCase("crickey!")) { - event.habbo.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(event.newMotto, event.habbo, event.habbo, RoomChatMessageBubbles.ALERT))); + if (Emulator.getConfig().getBoolean("easter_eggs.enabled") && event.getNewMotto().equalsIgnoreCase("crickey!")) { + event.habbo.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(event.getNewMotto(), event.habbo, event.habbo, RoomChatMessageBubbles.ALERT))); Room room = event.habbo.getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/core/TextsManager.java b/src/main/java/com/eu/habbo/core/TextsManager.java index 7981678f..33a4ace4 100644 --- a/src/main/java/com/eu/habbo/core/TextsManager.java +++ b/src/main/java/com/eu/habbo/core/TextsManager.java @@ -24,7 +24,7 @@ public class TextsManager { } } - public void reload() throws Exception { + public void reload() { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); Statement statement = connection.createStatement(); ResultSet set = statement.executeQuery("SELECT * FROM emulator_texts")) { while (set.next()) { if (this.texts.containsKey(set.getString("key"))) { diff --git a/src/main/java/com/eu/habbo/core/consolecommands/ConsoleInfoCommand.java b/src/main/java/com/eu/habbo/core/consolecommands/ConsoleInfoCommand.java index 211e8f82..f1fc9836 100644 --- a/src/main/java/com/eu/habbo/core/consolecommands/ConsoleInfoCommand.java +++ b/src/main/java/com/eu/habbo/core/consolecommands/ConsoleInfoCommand.java @@ -14,7 +14,7 @@ public class ConsoleInfoCommand extends ConsoleCommand { } @Override - public void handle(String[] args) throws Exception { + public void handle(String[] args) { int seconds = Emulator.getIntUnixTimestamp() - Emulator.getTimeStarted(); int day = (int) TimeUnit.SECONDS.toDays(seconds); long hours = TimeUnit.SECONDS.toHours(seconds) - (day * 24); diff --git a/src/main/java/com/eu/habbo/core/consolecommands/ConsoleReconnectCameraCommand.java b/src/main/java/com/eu/habbo/core/consolecommands/ConsoleReconnectCameraCommand.java index f1c31a95..bb55cdbf 100644 --- a/src/main/java/com/eu/habbo/core/consolecommands/ConsoleReconnectCameraCommand.java +++ b/src/main/java/com/eu/habbo/core/consolecommands/ConsoleReconnectCameraCommand.java @@ -11,7 +11,7 @@ public class ConsoleReconnectCameraCommand extends ConsoleCommand { } @Override - public void handle(String[] args) throws Exception { + public void handle(String[] args) { log.info("Connecting to the camera..."); CameraClient.attemptReconnect = true; } diff --git a/src/main/java/com/eu/habbo/core/consolecommands/ConsoleTestCommand.java b/src/main/java/com/eu/habbo/core/consolecommands/ConsoleTestCommand.java index 374109c4..d313f65a 100644 --- a/src/main/java/com/eu/habbo/core/consolecommands/ConsoleTestCommand.java +++ b/src/main/java/com/eu/habbo/core/consolecommands/ConsoleTestCommand.java @@ -13,7 +13,7 @@ public class ConsoleTestCommand extends ConsoleCommand { } @Override - public void handle(String[] args) throws Exception { + public void handle(String[] args) { if (Emulator.debugging) { log.info("This is a test command for live debugging."); diff --git a/src/main/java/com/eu/habbo/core/consolecommands/ShowInteractionsCommand.java b/src/main/java/com/eu/habbo/core/consolecommands/ShowInteractionsCommand.java index 14400e12..3b9e012d 100644 --- a/src/main/java/com/eu/habbo/core/consolecommands/ShowInteractionsCommand.java +++ b/src/main/java/com/eu/habbo/core/consolecommands/ShowInteractionsCommand.java @@ -11,7 +11,7 @@ public class ShowInteractionsCommand extends ConsoleCommand { } @Override - public void handle(String[] args) throws Exception { + public void handle(String[] args) { for (String interaction : Emulator.getGameEnvironment().getItemManager().getInteractionList()) { log.info(interaction); } diff --git a/src/main/java/com/eu/habbo/core/consolecommands/ShowRCONCommands.java b/src/main/java/com/eu/habbo/core/consolecommands/ShowRCONCommands.java index 4da7f13f..28da7266 100644 --- a/src/main/java/com/eu/habbo/core/consolecommands/ShowRCONCommands.java +++ b/src/main/java/com/eu/habbo/core/consolecommands/ShowRCONCommands.java @@ -11,7 +11,7 @@ public class ShowRCONCommands extends ConsoleCommand { } @Override - public void handle(String[] args) throws Exception { + public void handle(String[] args) { for (String command : Emulator.getRconServer().getCommands()) { log.info(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 index 761cae5b..a1d26180 100644 --- a/src/main/java/com/eu/habbo/core/consolecommands/ThankyouArcturusCommand.java +++ b/src/main/java/com/eu/habbo/core/consolecommands/ThankyouArcturusCommand.java @@ -11,7 +11,7 @@ public class ThankyouArcturusCommand extends ConsoleCommand { } @Override - public void handle(String[] args) throws Exception { + public void handle(String[] args) { log.info("Arcturus Morningstar is an opensource community fork of Arcturus Emulator by TheGeneral"); log.info("Thankyou to the following people who have helped with it's development:"); log.info("TheGeneral - For Creating Arcturus."); diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java b/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java index fbda5ee7..2b657c4e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/Bot.java @@ -215,7 +215,7 @@ public class Bot implements Runnable { return; this.chatTimestamp = Emulator.getIntUnixTimestamp(); - this.room.botChat(new ChatMessageComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose()); + this.room.botChat(new ChatMessageComposer(new RoomChatMessage(event.getMessage(), this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose()); if (message.equals("o/") || message.equals("_o/")) { this.room.sendComposer(new ExpressionMessageComposer(this.roomUnit, RoomUserAction.WAVE).compose()); @@ -230,7 +230,7 @@ public class Bot implements Runnable { return; this.chatTimestamp = Emulator.getIntUnixTimestamp(); - this.room.botChat(new ShoutMessageComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose()); + this.room.botChat(new ShoutMessageComposer(new RoomChatMessage(event.getMessage(), this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId()))).compose()); if (message.equals("o/") || message.equals("_o/")) { this.room.sendComposer(new ExpressionMessageComposer(this.roomUnit, RoomUserAction.WAVE).compose()); @@ -245,7 +245,7 @@ public class Bot implements Runnable { return; this.chatTimestamp = Emulator.getIntUnixTimestamp(); - event.target.getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(event.message, this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId())))); + event.getTarget().getClient().sendResponse(new WhisperMessageComposer(new RoomChatMessage(event.getMessage(), this.roomUnit, RoomChatMessageBubbles.getBubble(this.getBubbleId())))); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/ButlerBot.java b/src/main/java/com/eu/habbo/habbohotel/bots/ButlerBot.java index 84d979ee..b3e992aa 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/ButlerBot.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/ButlerBot.java @@ -85,19 +85,19 @@ public class ButlerBot extends Bot { final Bot bot = this; // Step 1: Look at Habbo - bot.lookAt(serveEvent.habbo); + bot.lookAt(serveEvent.getHabbo()); // Step 2: Prepare tasks for when the Bot (carrying the handitem) reaches the Habbo final List tasks = new ArrayList<>(); - tasks.add(new RoomUnitGiveHanditem(serveEvent.habbo.getRoomUnit(), serveEvent.habbo.getHabboInfo().getCurrentRoom(), serveEvent.itemId)); - tasks.add(new RoomUnitGiveHanditem(this.getRoomUnit(), serveEvent.habbo.getHabboInfo().getCurrentRoom(), 0)); + tasks.add(new RoomUnitGiveHanditem(serveEvent.getHabbo().getRoomUnit(), serveEvent.getHabbo().getHabboInfo().getCurrentRoom(), serveEvent.getItemId())); + tasks.add(new RoomUnitGiveHanditem(this.getRoomUnit(), serveEvent.getHabbo().getHabboInfo().getCurrentRoom(), 0)); tasks.add(() -> { if (this.getRoom() != null) { String botMessage = Emulator.getTexts() .getValue("bots.butler.given") .replace("%key%", key) - .replace("%username%", serveEvent.habbo.getHabboInfo().getUsername()); + .replace("%username%", serveEvent.getHabbo().getHabboInfo().getUsername()); if (!WiredHandler.handle(WiredTriggerType.SAY_SOMETHING, this.getRoomUnit(), this.getRoom(), new Object[]{botMessage})) { bot.talk(botMessage); @@ -115,18 +115,18 @@ public class ButlerBot extends Bot { }); // Give bot the handitem that it's going to give the Habbo - Emulator.getThreading().run(new RoomUnitGiveHanditem(this.getRoomUnit(), serveEvent.habbo.getHabboInfo().getCurrentRoom(), serveEvent.itemId)); + Emulator.getThreading().run(new RoomUnitGiveHanditem(this.getRoomUnit(), serveEvent.getHabbo().getHabboInfo().getCurrentRoom(), serveEvent.getItemId())); if (distanceBetweenBotAndHabbo > Emulator.getConfig().getInt("hotel.bot.butler.reachdistance", 3)) { - Emulator.getThreading().run(new RoomUnitWalkToRoomUnit(this.getRoomUnit(), serveEvent.habbo.getRoomUnit(), serveEvent.habbo.getHabboInfo().getCurrentRoom(), tasks, failedReached, Emulator.getConfig().getInt("hotel.bot.butler.reachdistance", 3))); + Emulator.getThreading().run(new RoomUnitWalkToRoomUnit(this.getRoomUnit(), serveEvent.getHabbo().getRoomUnit(), serveEvent.getHabbo().getHabboInfo().getCurrentRoom(), tasks, failedReached, Emulator.getConfig().getInt("hotel.bot.butler.reachdistance", 3))); } else { Emulator.getThreading().run(failedReached.get(0), 1000); } } else { if (this.getRoom() != null) { - this.getRoom().giveHandItem(serveEvent.habbo, serveEvent.itemId); + this.getRoom().giveHandItem(serveEvent.getHabbo(), serveEvent.getItemId()); - String msg = Emulator.getTexts().getValue("bots.butler.given").replace("%key%", keyword).replace("%username%", serveEvent.habbo.getHabboInfo().getUsername()); + String msg = Emulator.getTexts().getValue("bots.butler.given").replace("%key%", keyword).replace("%username%", serveEvent.getHabbo().getHabboInfo().getUsername()); if (!WiredHandler.handle(WiredTriggerType.SAY_SOMETHING, this.getRoomUnit(), this.getRoom(), new Object[]{msg})) { this.talk(msg); } 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 4a0d542e..1b3a2409 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/CatalogManager.java @@ -1054,16 +1054,16 @@ public class CatalogManager { Emulator.getPluginManager().fireEvent(purchasedEvent); if (!free && !habbo.getClient().getHabbo().hasPermission(Permission.ACC_INFINITE_CREDITS)) { - if (purchasedEvent.totalCredits > 0) { - habbo.getClient().getHabbo().getHabboInfo().addCredits(-purchasedEvent.totalCredits); + if (purchasedEvent.getTotalCredits() > 0) { + habbo.getClient().getHabbo().getHabboInfo().addCredits(-purchasedEvent.getTotalCredits()); habbo.getClient().sendResponse(new CreditBalanceComposer(habbo.getClient().getHabbo())); } } if (!free && !habbo.getClient().getHabbo().hasPermission(Permission.ACC_INFINITE_POINTS)) { - if (purchasedEvent.totalPoints > 0) { - habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(item.getPointsType(), -purchasedEvent.totalPoints); - habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -purchasedEvent.totalPoints, item.getPointsType())); + if (purchasedEvent.getTotalPoints() > 0) { + habbo.getClient().getHabbo().getHabboInfo().addCurrencyAmount(item.getPointsType(), -purchasedEvent.getTotalPoints()); + habbo.getClient().sendResponse(new HabboActivityPointNotificationMessageComposer(habbo.getClient().getHabbo().getHabboInfo().getCurrencyAmount(item.getPointsType()), -purchasedEvent.getTotalPoints(), item.getPointsType())); } } @@ -1080,11 +1080,11 @@ public class CatalogManager { } } - if (!purchasedEvent.badges.isEmpty() && !unseenItems.containsKey(UnseenItemsComposer.AddHabboItemCategory.BADGE)) { + if (!purchasedEvent.getBadges().isEmpty() && !unseenItems.containsKey(UnseenItemsComposer.AddHabboItemCategory.BADGE)) { unseenItems.put(UnseenItemsComposer.AddHabboItemCategory.BADGE, new ArrayList<>()); } - for (String b : purchasedEvent.badges) { + for (String b : purchasedEvent.getBadges()) { HabboBadge badge = new HabboBadge(0, b, 0, habbo); Emulator.getThreading().run(badge); habbo.getInventory().getBadgesComponent().addBadge(badge); @@ -1096,11 +1096,11 @@ public class CatalogManager { habbo.getClient().sendResponse(new NotificationDialogMessageComposer(BubbleAlertKeys.RECEIVED_BADGE.getKey(), keys)); unseenItems.get(UnseenItemsComposer.AddHabboItemCategory.BADGE).add(badge.getId()); } - habbo.getClient().getHabbo().getHabboStats().addPurchase(purchasedEvent.catalogItem); + habbo.getClient().getHabbo().getHabboStats().addPurchase(purchasedEvent.getCatalogItem()); habbo.getClient().sendResponse(new UnseenItemsComposer(unseenItems)); - habbo.getClient().sendResponse(new PurchaseOKMessageComposer(purchasedEvent.catalogItem)); + habbo.getClient().sendResponse(new PurchaseOKMessageComposer(purchasedEvent.getCatalogItem())); habbo.getClient().sendResponse(new FurniListInvalidateComposer()); THashSet itemIds = new THashSet<>(); @@ -1113,11 +1113,11 @@ public class CatalogManager { Emulator.getThreading().run(new CatalogPurchaseLogEntry( Emulator.getIntUnixTimestamp(), purchasedEvent.habbo.getHabboInfo().getId(), - purchasedEvent.catalogItem != null ? purchasedEvent.catalogItem.getId() : 0, + purchasedEvent.getCatalogItem() != null ? purchasedEvent.getCatalogItem().getId() : 0, String.join(";", itemIds), - purchasedEvent.catalogItem != null ? purchasedEvent.catalogItem.getName() : "", - purchasedEvent.totalCredits, - purchasedEvent.totalPoints, + purchasedEvent.getCatalogItem() != null ? purchasedEvent.getCatalogItem().getName() : "", + purchasedEvent.getTotalCredits(), + purchasedEvent.getTotalPoints(), item.getPointsType(), amount )); diff --git a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java index 31850d93..2474d626 100644 --- a/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java +++ b/src/main/java/com/eu/habbo/habbohotel/catalog/marketplace/MarketPlace.java @@ -346,14 +346,14 @@ public class MarketPlace { GetMarketplaceOffersEvent.cachedResults.clear(); - client.sendResponse(new FurniListRemoveComposer(event.item.getGiftAdjustedId())); + client.sendResponse(new FurniListRemoveComposer(event.getItem().getGiftAdjustedId())); client.sendResponse(new FurniListInvalidateComposer()); - event.item.setFromGift(false); + event.getItem().setFromGift(false); - MarketPlaceOffer offer = new MarketPlaceOffer(event.item, event.price, client.getHabbo()); + MarketPlaceOffer offer = new MarketPlaceOffer(event.getItem(), event.getPrice(), client.getHabbo()); client.getHabbo().getInventory().addMarketplaceOffer(offer); - client.getHabbo().getInventory().getItemsComponent().removeHabboItem(event.item); + client.getHabbo().getInventory().getItemsComponent().removeHabboItem(event.getItem()); item.setUserId(-1); item.needsUpdate(true); Emulator.getThreading().run(item); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/AboutCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/AboutCommand.java index b15499d4..b1a137ad 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/AboutCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/AboutCommand.java @@ -13,7 +13,7 @@ public class AboutCommand extends Command { public AboutCommand() { super(null, new String[]{"about", "info", "online", "server"}); } - public static String credits = "Arcturus Morningstar is an opensource project based on Arcturus By TheGeneral \n" + + public static final String credits = "Arcturus Morningstar is an opensource project based on Arcturus By TheGeneral \n" + "The Following people have all contributed to this emulator:\n" + " TheGeneral\n Beny\n Alejandro\n Capheus\n Skeletor\n Harmonic\n Mike\n Remco\n zGrav \n Quadral \n Harmony\n Swirny\n ArpyAge\n Mikkel\n Rodolfo\n Rasmus\n Kitt Mustang\n Snaiker\n nttzx\n necmi\n Dome\n Jose Flores\n Cam\n Oliver\n Narzo\n Tenshie\n MartenM\n Ridge\n SenpaiDipper\n Snaiker\n Thijmen"; @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ArcturusCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ArcturusCommand.java index d3a786cc..eed94fd2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ArcturusCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ArcturusCommand.java @@ -9,7 +9,7 @@ public class ArcturusCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { gameClient.getHabbo().whisper("This hotel is powered by Arcturus Emulator! \r" + "Cet hôtel est alimenté par Arcturus émulateur! \r" + diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java index 899b954b..40e715f5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/BadgeCommand.java @@ -21,7 +21,7 @@ public class BadgeCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 1) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_badge.forgot_username"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/BanCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/BanCommand.java index 8b447a0f..b37dbbf0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/BanCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/BanCommand.java @@ -15,7 +15,7 @@ public class BanCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_ban.forgot_user"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/BlockAlertCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/BlockAlertCommand.java index f23691cc..ab8ff887 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/BlockAlertCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/BlockAlertCommand.java @@ -10,7 +10,7 @@ public class BlockAlertCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { gameClient.getHabbo().getHabboStats().setBlockStaffAlerts(!gameClient.getHabbo().getHabboStats().isBlockStaffAlerts()); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_blockalert").replace("%state%", (gameClient.getHabbo().getHabboStats().isBlockStaffAlerts() ? Emulator.getTexts().getValue("generic.on") : Emulator.getTexts().getValue("generic.off"))), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/BotsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/BotsCommand.java index 10650e19..6c49e89e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/BotsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/BotsCommand.java @@ -10,7 +10,7 @@ public class BotsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() == null || !gameClient.getHabbo().getHabboInfo().getCurrentRoom().hasRights(gameClient.getHabbo())) return false; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java index 90a7dad0..f4e6210e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java @@ -17,7 +17,7 @@ public class CalendarCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (Emulator.getConfig().getBoolean("hotel.calendar.enabled")) { String campaignName = Emulator.getConfig().getValue("hotel.calendar.default"); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ChangeNameCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ChangeNameCommand.java index bed49403..25bf2774 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ChangeNameCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ChangeNameCommand.java @@ -11,7 +11,7 @@ public class ChangeNameCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { // check if there are no params if (params.length < 2) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ChatTypeCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ChatTypeCommand.java index 0e7ae5c0..57f8a421 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ChatTypeCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ChatTypeCommand.java @@ -12,7 +12,7 @@ public class ChatTypeCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length >= 2) { int chatColor; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/CommandsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/CommandsCommand.java index 358f4266..c3045199 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/CommandsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/CommandsCommand.java @@ -11,7 +11,7 @@ public class CommandsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { StringBuilder message = new StringBuilder(Emulator.getTexts().getValue("commands.generic.cmd_commands.text")); List commands = Emulator.getGameEnvironment().getCommandHandler().getCommandsForRank(gameClient.getHabbo().getHabboInfo().getRank().getId()); message.append("(").append(commands.size()).append("):\r\n"); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ConnectCameraCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ConnectCameraCommand.java index 34ba2b0b..e5160958 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ConnectCameraCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ConnectCameraCommand.java @@ -9,7 +9,7 @@ public class ConnectCameraCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { return false; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ControlCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ControlCommand.java index 269ad245..a2e7bed6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ControlCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ControlCommand.java @@ -11,7 +11,7 @@ public class ControlCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (params.length == 2) { Habbo target = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/CoordsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/CoordsCommand.java index 48399f27..d98b00de 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/CoordsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/CoordsCommand.java @@ -12,7 +12,7 @@ public class CoordsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getRoomUnit() == null || gameClient.getHabbo().getHabboInfo().getCurrentRoom() == null) return false; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/CreditsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/CreditsCommand.java index 4e6dc387..032cc6e8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/CreditsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/CreditsCommand.java @@ -13,7 +13,7 @@ public class CreditsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 3) { HabboInfo info = HabboManager.getOfflineHabboInfo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/DiagonalCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/DiagonalCommand.java index 002393be..03dd5fa4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/DiagonalCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/DiagonalCommand.java @@ -10,7 +10,7 @@ public class DiagonalCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().hasRights(gameClient.getHabbo())) { gameClient.getHabbo().getHabboInfo().getCurrentRoom().moveDiagonally(!gameClient.getHabbo().getHabboInfo().getCurrentRoom().moveDiagonally()); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/DisconnectCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/DisconnectCommand.java index 82dd200e..7e8f612b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/DisconnectCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/DisconnectCommand.java @@ -11,7 +11,7 @@ public class DisconnectCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_disconnect.forgot_username"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/EjectAllCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/EjectAllCommand.java index 51fa9589..a0d67148 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EjectAllCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EjectAllCommand.java @@ -11,7 +11,7 @@ public class EjectAllCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/EmptyBotsInventoryCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/EmptyBotsInventoryCommand.java index d439d036..7d5b8aff 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EmptyBotsInventoryCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EmptyBotsInventoryCommand.java @@ -16,7 +16,7 @@ public class EmptyBotsInventoryCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 1 || (params.length >= 2 && !params[1].equals(Emulator.getTexts().getValue("generic.yes")))) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().getUserCount() > 10) { 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 8d2f2d8e..36cba1cb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EmptyInventoryCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EmptyInventoryCommand.java @@ -18,7 +18,7 @@ public class EmptyInventoryCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 1 || (params.length == 2 && !params[1].equals(Emulator.getTexts().getValue("generic.yes")))) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().getUserCount() > 10) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/EmptyPetsInventoryCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/EmptyPetsInventoryCommand.java index 513c4cd3..c251db55 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EmptyPetsInventoryCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EmptyPetsInventoryCommand.java @@ -16,7 +16,7 @@ public class EmptyPetsInventoryCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 1 || (params.length >= 2 && !params[1].equals(Emulator.getTexts().getValue("generic.yes")))) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().getUserCount() > 10) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/EnableCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/EnableCommand.java index b9a44e40..2dc5f5cc 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EnableCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EnableCommand.java @@ -14,7 +14,7 @@ public class EnableCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length >= 2) { int effectId; try { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/EventCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/EventCommand.java index 1c2e9eab..1ac8424a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EventCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EventCommand.java @@ -15,7 +15,7 @@ public class EventCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (params.length >= 2) { StringBuilder message = new StringBuilder(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/FacelessCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/FacelessCommand.java index a897b7cd..ce3574f4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/FacelessCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/FacelessCommand.java @@ -12,7 +12,7 @@ public class FacelessCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { try { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/FastwalkCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/FastwalkCommand.java index 51c4c399..24e4b006 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/FastwalkCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/FastwalkCommand.java @@ -10,7 +10,7 @@ public class FastwalkCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (gameClient.getHabbo().getHabboInfo().getRiding() != null) //TODO Make this an event plugin which fires that can be cancelled diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/FilterWordCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/FilterWordCommand.java index e746f954..4d985b10 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/FilterWordCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/FilterWordCommand.java @@ -18,7 +18,7 @@ public class FilterWordCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_filterword.missing_word")); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/FreezeBotsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/FreezeBotsCommand.java index 37b57aaa..22d65c7d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/FreezeBotsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/FreezeBotsCommand.java @@ -11,7 +11,7 @@ public class FreezeBotsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (gameClient.getHabbo().getHabboInfo().getId() == gameClient.getHabbo().getHabboInfo().getCurrentRoom().getOwnerId() || gameClient.getHabbo().hasPermission(Permission.ACC_ANYROOMOWNER)) { gameClient.getHabbo().getHabboInfo().getCurrentRoom().setAllowBotsWalk(!gameClient.getHabbo().getHabboInfo().getCurrentRoom().isAllowBotsWalk()); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/FreezeCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/FreezeCommand.java index c79d5aa1..3cab9d9a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/FreezeCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/FreezeCommand.java @@ -11,7 +11,7 @@ public class FreezeCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/GiftCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/GiftCommand.java index 05abb1f7..85f1d2e5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/GiftCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/GiftCommand.java @@ -19,7 +19,7 @@ public class GiftCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length >= 3) { String username = params[1]; int itemId; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HabnamCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HabnamCommand.java index b1ccb3a6..fe2b9499 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HabnamCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HabnamCommand.java @@ -8,7 +8,7 @@ public class HabnamCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboStats().hasActiveClub()) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { gameClient.getHabbo().getHabboInfo().getCurrentRoom().giveEffect(gameClient.getHabbo(), 140, 30); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HandItemCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HandItemCommand.java index 1a81d880..77175958 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HandItemCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HandItemCommand.java @@ -10,7 +10,7 @@ public class HandItemCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { try { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HappyHourCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HappyHourCommand.java index fc735970..4c7397ab 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HappyHourCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HappyHourCommand.java @@ -14,7 +14,7 @@ public class HappyHourCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameServer().getGameClientManager().sendBroadcastResponse(new HabboBroadcastMessageComposer("Happy Hour!")); for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HideWiredCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HideWiredCommand.java index 8141d02c..a86778bf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HideWiredCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HideWiredCommand.java @@ -10,7 +10,7 @@ public class HideWiredCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertLinkCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertLinkCommand.java index 15fd3d21..9b689ae9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertLinkCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertLinkCommand.java @@ -10,7 +10,7 @@ public class HotelAlertLinkCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 3) { return true; } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/IPBanCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/IPBanCommand.java index e37bb1e0..0568d975 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/IPBanCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/IPBanCommand.java @@ -16,7 +16,7 @@ public class IPBanCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { HabboInfo habbo; StringBuilder reason = new StringBuilder(); if (params.length >= 2) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/InvisibleCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/InvisibleCommand.java index 64b019b9..19d52924 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/InvisibleCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/InvisibleCommand.java @@ -17,7 +17,7 @@ public class InvisibleCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { RoomUnit roomUnit = gameClient.getHabbo().getRoomUnit(); if (roomUnit.isInvisible()) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/LayCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/LayCommand.java index 539cc0ea..050adfd9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/LayCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/LayCommand.java @@ -13,7 +13,7 @@ public class LayCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getRoomUnit() == null || !gameClient.getHabbo().getRoomUnit().canForcePosture()) return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MachineBanCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MachineBanCommand.java index 56f5b0fb..12e6460e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MachineBanCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MachineBanCommand.java @@ -14,7 +14,7 @@ public class MachineBanCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { HabboInfo habbo = null; StringBuilder reason = new StringBuilder(); if (params.length >= 2) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MassBadgeCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MassBadgeCommand.java index 267327ff..3fdd1b89 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassBadgeCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassBadgeCommand.java @@ -20,7 +20,7 @@ public class MassBadgeCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { String badge; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MassCreditsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MassCreditsCommand.java index 584fa20d..5cb7f887 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassCreditsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassCreditsCommand.java @@ -14,7 +14,7 @@ public class MassCreditsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { int amount; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MassGiftCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MassGiftCommand.java index b267cbba..30825c47 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassGiftCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassGiftCommand.java @@ -20,7 +20,7 @@ public class MassGiftCommand extends Command { } @Override - public boolean handle(final GameClient gameClient, String[] params) throws Exception { + public boolean handle(final GameClient gameClient, String[] params) { if (params.length >= 2) { int itemId; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MassPixelsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MassPixelsCommand.java index 504bd75e..4c7c6a53 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassPixelsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassPixelsCommand.java @@ -13,7 +13,7 @@ public class MassPixelsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { int amount; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MassPointsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MassPointsCommand.java index dd659c7a..510e2baa 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassPointsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassPointsCommand.java @@ -13,7 +13,7 @@ public class MassPointsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { int type = Emulator.getConfig().getInt("seasonal.primary.type"); String amountString; if (params.length == 3) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MimicCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MimicCommand.java index 6d6c9b0a..958bbd38 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MimicCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MimicCommand.java @@ -17,7 +17,7 @@ public class MimicCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MoonwalkCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MoonwalkCommand.java index 676871d0..4a4af3c7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MoonwalkCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MoonwalkCommand.java @@ -9,7 +9,7 @@ public class MoonwalkCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null && gameClient.getHabbo().getHabboStats().hasActiveClub()) { int effect = 136; if (gameClient.getHabbo().getRoomUnit().getEffectId() == 136) diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MultiCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MultiCommand.java index 8e9e2bfe..e5d482d6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MultiCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MultiCommand.java @@ -10,7 +10,7 @@ public class MultiCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { gameClient.sendResponse(new RequestSpamWallPostItMessageComposer(null)); return true; } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MuteBotsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MuteBotsCommand.java index 15e29098..1958c3ea 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MuteBotsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MuteBotsCommand.java @@ -10,7 +10,7 @@ public class MuteBotsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { gameClient.getHabbo().getHabboStats().setIgnoreBots(!gameClient.getHabbo().getHabboStats().isIgnoreBots()); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mute_bots." + (gameClient.getHabbo().getHabboStats().isIgnoreBots() ? "ignored" : "unignored")), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java index 0b0d60f2..9fc016de 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MuteCommand.java @@ -12,7 +12,7 @@ public class MuteCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 1) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_mute.not_specified"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/MutePetsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/MutePetsCommand.java index 7c33c505..f9f0f2ba 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MutePetsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MutePetsCommand.java @@ -10,7 +10,7 @@ public class MutePetsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { gameClient.getHabbo().getHabboStats().setIgnorePets(!gameClient.getHabbo().getHabboStats().isIgnorePets()); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_mute_pets." + (gameClient.getHabbo().getHabboStats().isIgnorePets() ? "ignored" : "unignored")), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PetInfoCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PetInfoCommand.java index ffe2d433..2c53adb6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PetInfoCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PetInfoCommand.java @@ -11,7 +11,7 @@ public class PetInfoCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length > 1) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() == null) return false; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PickallCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PickallCommand.java index 2e7b8d75..58cb4aa4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PickallCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PickallCommand.java @@ -10,7 +10,7 @@ public class PickallCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PixelCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PixelCommand.java index 11a7eb99..0b25107d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PixelCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PixelCommand.java @@ -11,7 +11,7 @@ public class PixelCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 3) { Habbo habbo = Emulator.getGameServer().getGameClientManager().getHabbo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PluginsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PluginsCommand.java index ea3cd72f..ad0f1824 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PluginsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PluginsCommand.java @@ -13,7 +13,7 @@ public class PluginsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { StringBuilder message = new StringBuilder("Plugins (" + Emulator.getPluginManager().getPlugins().size() + ")\r"); for (HabboPlugin plugin : Emulator.getPluginManager().getPlugins()) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PointsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PointsCommand.java index 56ca70cd..63cd9c2c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PointsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PointsCommand.java @@ -11,7 +11,7 @@ public class PointsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length >= 3) { Habbo habbo = Emulator.getGameServer().getGameClientManager().getHabbo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PromoteTargetOfferCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PromoteTargetOfferCommand.java index 6263bb88..35622227 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PromoteTargetOfferCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PromoteTargetOfferCommand.java @@ -18,7 +18,7 @@ public class PromoteTargetOfferCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length <= 1) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_promote_offer.not_found")); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java index f1f49c67..51e25aa8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PullCommand.java @@ -15,7 +15,7 @@ public class PullCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length != 2) return true; Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java index f8a4fffe..6944fab7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/PushCommand.java @@ -15,7 +15,7 @@ public class PushCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length != 2) return true; Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RedeemCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RedeemCommand.java index df56edad..41d6fd0a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RedeemCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RedeemCommand.java @@ -18,7 +18,7 @@ public class RedeemCommand extends Command { } @Override - public boolean handle(final GameClient gameClient, String[] params) throws Exception { + public boolean handle(final GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().getActiveTradeForHabbo(gameClient.getHabbo()) != null) return false; ArrayList items = new ArrayList<>(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java index c32be1f8..83dc8e0d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java @@ -16,7 +16,7 @@ public class ReloadRoomCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getThreading().run(() -> { Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomAlertCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomAlertCommand.java index 6f6233e2..0c3c8f64 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomAlertCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomAlertCommand.java @@ -12,7 +12,7 @@ public class RoomAlertCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { StringBuilder message = new StringBuilder(); if (params.length >= 2) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomBadgeCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomBadgeCommand.java index 099ff962..7cf20315 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomBadgeCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomBadgeCommand.java @@ -18,7 +18,7 @@ public class RoomBadgeCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient == null) return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomBundleCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomBundleCommand.java index 1ce9dfc1..289b00af 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomBundleCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomBundleCommand.java @@ -19,7 +19,7 @@ public class RoomBundleCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { int parentId; int credits; int points; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomCreditsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomCreditsCommand.java index 762b1d29..3b599c94 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomCreditsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomCreditsCommand.java @@ -11,7 +11,7 @@ public class RoomCreditsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { int amount; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomDanceCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomDanceCommand.java index 32db45a0..1c1310cf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomDanceCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomDanceCommand.java @@ -13,7 +13,7 @@ public class RoomDanceCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { int danceId; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomEffectCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomEffectCommand.java index 0f4fb4f2..535ee273 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomEffectCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomEffectCommand.java @@ -12,7 +12,7 @@ public class RoomEffectCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_roomeffect.no_effect"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomGiftCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomGiftCommand.java index ad0aa1c7..c00465eb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomGiftCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomGiftCommand.java @@ -15,7 +15,7 @@ public class RoomGiftCommand extends Command { } @Override - public boolean handle(final GameClient gameClient, String[] params) throws Exception { + public boolean handle(final GameClient gameClient, String[] params) { if (params.length >= 2) { int itemId; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomItemCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomItemCommand.java index 34a55915..8853a52d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomItemCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomItemCommand.java @@ -12,7 +12,7 @@ public class RoomItemCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { int itemId = 0; if (params.length >= 2) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomKickCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomKickCommand.java index a3fd6985..4190581c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomKickCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomKickCommand.java @@ -13,7 +13,7 @@ public class RoomKickCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { final Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { if (params.length > 1) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomMuteCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomMuteCommand.java index 5ee1bd4b..689ee263 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomMuteCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomMuteCommand.java @@ -11,7 +11,7 @@ public class RoomMuteCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomPixelsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomPixelsCommand.java index b28fd599..644dab8b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomPixelsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomPixelsCommand.java @@ -11,7 +11,7 @@ public class RoomPixelsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { int amount; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/RoomPointsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/RoomPointsCommand.java index eac86282..6ae63460 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/RoomPointsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/RoomPointsCommand.java @@ -11,7 +11,7 @@ public class RoomPointsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { int type = Emulator.getConfig().getInt("seasonal.primary.type"); String amountString; if (params.length == 3) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SayAllCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SayAllCommand.java index 17cf15a8..26ac9292 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SayAllCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SayAllCommand.java @@ -11,7 +11,7 @@ public class SayAllCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_say_all.forgot_message"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SayCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SayCommand.java index 71466d38..3fe9367c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SayCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SayCommand.java @@ -13,7 +13,7 @@ public class SayCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_say.forgot_username"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SetMaxCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SetMaxCommand.java index ae173d33..ff57f21f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SetMaxCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SetMaxCommand.java @@ -10,7 +10,7 @@ public class SetMaxCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length >= 2) { int max; try { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SetPollCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SetPollCommand.java index 9678aadb..e3064cc9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SetPollCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SetPollCommand.java @@ -10,7 +10,7 @@ public class SetPollCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length >= 2) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { int pollId = -1; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SetSpeedCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SetSpeedCommand.java index ab9c1fe2..ed67a1e8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SetSpeedCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SetSpeedCommand.java @@ -11,7 +11,7 @@ public class SetSpeedCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().hasRights(gameClient.getHabbo())) { Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ShoutAllCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ShoutAllCommand.java index 156a4dac..249c4d8e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ShoutAllCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ShoutAllCommand.java @@ -11,7 +11,7 @@ public class ShoutAllCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_shout_all.forgot_message"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ShoutCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ShoutCommand.java index c48360c4..880a056a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ShoutCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ShoutCommand.java @@ -14,7 +14,7 @@ public class ShoutCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_shout.forgot_username"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java index 2aab18d3..5dfe34ac 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ShutdownCommand.java @@ -14,7 +14,7 @@ public class ShutdownCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { StringBuilder reason = new StringBuilder("-"); int minutes = 0; if (params.length > 2) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SitCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SitCommand.java index dd8199ce..808ced5c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SitCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SitCommand.java @@ -9,7 +9,7 @@ public class SitCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getRiding() == null) //TODO Make this an event plugin which fires that can be cancelled gameClient.getHabbo().getHabboInfo().getCurrentRoom().makeSit(gameClient.getHabbo()); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SitDownCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SitDownCommand.java index afb37a38..37c4bac0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SitDownCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SitDownCommand.java @@ -11,7 +11,7 @@ public class SitDownCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { for (Habbo habbo : gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbos()) { if (habbo.getRoomUnit().isWalking()) { habbo.getRoomUnit().stopWalking(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SoftKickCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SoftKickCommand.java index 5b0fddcd..69bc0345 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SoftKickCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SoftKickCommand.java @@ -13,7 +13,7 @@ public class SoftKickCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length != 2) return true; final Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/StaffAlertCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/StaffAlertCommand.java index b227be3a..2ba1ed45 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/StaffAlertCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/StaffAlertCommand.java @@ -12,7 +12,7 @@ public class StaffAlertCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length > 1) { StringBuilder message = new StringBuilder(); for (int i = 1; i < params.length; i++) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/StaffOnlineCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/StaffOnlineCommand.java index fe47fdab..eb1a5bcf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/StaffOnlineCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/StaffOnlineCommand.java @@ -15,7 +15,7 @@ public class StaffOnlineCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { int minRank = Emulator.getConfig().getInt("commands.cmd_staffonline.min_rank"); if (params.length >= 2) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/StalkCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/StalkCommand.java index 55e9d446..11fed574 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/StalkCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/StalkCommand.java @@ -12,7 +12,7 @@ public class StalkCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() == null) return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/StandCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/StandCommand.java index 82bf092c..07077977 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/StandCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/StandCommand.java @@ -10,7 +10,7 @@ public class StandCommand extends Command { @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getRiding() == null) gameClient.getHabbo().getHabboInfo().getCurrentRoom().makeStand(gameClient.getHabbo()); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SubscriptionCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SubscriptionCommand.java index 27b7e55b..1a18b404 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SubscriptionCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SubscriptionCommand.java @@ -34,10 +34,9 @@ public class SubscriptionCommand extends Command { * @param gameClient Client that executed the command * @param params Command parameters * @return Boolean indicating success - * @throws Exception Exception */ @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length >= 4) { HabboInfo info = HabboManager.getOfflineHabboInfo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SummonCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SummonCommand.java index 71bb9de0..4699866e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SummonCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SummonCommand.java @@ -13,7 +13,7 @@ public class SummonCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom() == null) return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SummonRankCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SummonRankCommand.java index c5d93cc0..ace86821 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SummonRankCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SummonRankCommand.java @@ -15,7 +15,7 @@ public class SummonRankCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { int minRank; if (params.length >= 2) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SuperPullCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SuperPullCommand.java index 53bbe0ce..0ece8ed7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SuperPullCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SuperPullCommand.java @@ -15,7 +15,7 @@ public class SuperPullCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { Habbo habbo = gameClient.getHabbo().getHabboInfo().getCurrentRoom().getHabbo(params[1]); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/SuperbanCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/SuperbanCommand.java index 8f9d8968..d4c9ee6e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/SuperbanCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/SuperbanCommand.java @@ -14,7 +14,7 @@ public class SuperbanCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { HabboInfo habbo = null; StringBuilder reason = new StringBuilder(); if (params.length >= 2) { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/TakeBadgeCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/TakeBadgeCommand.java index a07e8d19..9a0a1845 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/TakeBadgeCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/TakeBadgeCommand.java @@ -17,7 +17,7 @@ public class TakeBadgeCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_take_badge.forgot_badge"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/TeleportCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/TeleportCommand.java index 4a79e88c..ac5e3ff9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/TeleportCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/TeleportCommand.java @@ -10,7 +10,7 @@ public class TeleportCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getRiding() == null) //TODO Make this an event plugin which fires that can be cancelled if (gameClient.getHabbo().getRoomUnit().cmdTeleport) { gameClient.getHabbo().getRoomUnit().cmdTeleport = false; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/TestCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/TestCommand.java index 6c9eceab..317a9123 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/TestCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/TestCommand.java @@ -11,7 +11,7 @@ public class TestCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo() != null || !gameClient.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL) || !Emulator.debugging) return false; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java index d7337d37..606ad427 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/TransformCommand.java @@ -18,7 +18,7 @@ public class TransformCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 1) { StringBuilder petNames = new StringBuilder(); petNames.append(Emulator.getTexts().getValue("commands.generic.cmd_transform.title")); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/TrashCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/TrashCommand.java index 196fecce..5d2c91eb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/TrashCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/TrashCommand.java @@ -9,7 +9,7 @@ public class TrashCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { gameClient.getHabbo().whisper("Sorry. Lulz mode removed |"); return false; } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UnbanCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UnbanCommand.java index dea44bd3..cdcb6903 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UnbanCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UnbanCommand.java @@ -10,7 +10,7 @@ public class UnbanCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 1) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_unban.not_specified"), RoomChatMessageBubbles.ALERT); } else { diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UnloadRoomCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UnloadRoomCommand.java index 8082401c..c75a9436 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UnloadRoomCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UnloadRoomCommand.java @@ -11,7 +11,7 @@ public class UnloadRoomCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (gameClient.getHabbo().getHabboInfo().getCurrentRoom().getOwnerId() == gameClient.getHabbo().getHabboInfo().getId() || gameClient.getHabbo().getHabboInfo().getRank().getId() > 4) { Room room = gameClient.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UnmuteCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UnmuteCommand.java index 376f8b94..e2cb4703 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UnmuteCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UnmuteCommand.java @@ -11,7 +11,7 @@ public class UnmuteCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length == 1) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_unmute.not_specified"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateAchievements.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateAchievements.java index 70dc56fd..5631aa7f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateAchievements.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateAchievements.java @@ -10,7 +10,7 @@ public class UpdateAchievements extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getAchievementManager().reload(); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_update_achievements.updated"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateBotsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateBotsCommand.java index eaf57e94..6bdbf946 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateBotsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateBotsCommand.java @@ -9,7 +9,7 @@ public class UpdateBotsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { return Emulator.getGameEnvironment().getBotManager().reload(); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateConfigCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateConfigCommand.java index 7b859cd5..c1de3bce 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateConfigCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateConfigCommand.java @@ -10,7 +10,7 @@ public class UpdateConfigCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getConfig().reload(); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_update_config"), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateGuildPartsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateGuildPartsCommand.java index b7b47a91..c34ff591 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateGuildPartsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateGuildPartsCommand.java @@ -9,7 +9,7 @@ public class UpdateGuildPartsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getGuildManager().loadGuildParts(); Emulator.getBadgeImager().reload(); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateHotelViewCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateHotelViewCommand.java index 88f9c606..72eab994 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateHotelViewCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateHotelViewCommand.java @@ -9,7 +9,7 @@ public class UpdateHotelViewCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getHotelViewManager().getNewsList().reload(); Emulator.getGameEnvironment().getHotelViewManager().getHallOfFame().reload(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java index e5570e20..1e7c6f0c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateItemsCommand.java @@ -12,7 +12,7 @@ public class UpdateItemsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getItemManager().loadItems(); Emulator.getGameEnvironment().getItemManager().loadCrackable(); Emulator.getGameEnvironment().getItemManager().loadSoundTracks(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateNavigatorCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateNavigatorCommand.java index c01c2e94..b6f99dd7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateNavigatorCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateNavigatorCommand.java @@ -10,7 +10,7 @@ public class UpdateNavigatorCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getNavigatorManager().loadNavigator(); Emulator.getGameEnvironment().getRoomManager().loadRoomModels(); Emulator.getGameEnvironment().getRoomManager().loadPublicRooms(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePermissionsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePermissionsCommand.java index 9f257bdd..afc0f02c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePermissionsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePermissionsCommand.java @@ -10,7 +10,7 @@ public class UpdatePermissionsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getPermissionsManager().reload(); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_update_permissions"), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePetDataCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePetDataCommand.java index 5d07e2d1..a972a3f5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePetDataCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePetDataCommand.java @@ -10,7 +10,7 @@ public class UpdatePetDataCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getPetManager().reloadPetData(); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_update_pet_data"), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePluginsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePluginsCommand.java index 285d98d9..0e893bdb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePluginsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePluginsCommand.java @@ -10,7 +10,7 @@ public class UpdatePluginsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getPluginManager().reload(); gameClient.getHabbo().whisper("This is an unsafe command and could possibly lead to memory leaks.\rIt is recommended to restart the emulator in order to reload plugins."); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePollsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePollsCommand.java index c82e2d5e..4d8dca2e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePollsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdatePollsCommand.java @@ -10,7 +10,7 @@ public class UpdatePollsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getPollManager().loadPolls(); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_update_polls"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateTextsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateTextsCommand.java index a8a68b9a..98d1eec6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateTextsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateTextsCommand.java @@ -10,7 +10,7 @@ public class UpdateTextsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { try { Emulator.getTexts().reload(); Emulator.getGameEnvironment().getCommandHandler().reloadCommands(); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateWordFilterCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateWordFilterCommand.java index ad70f802..6e21abef 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateWordFilterCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateWordFilterCommand.java @@ -10,7 +10,7 @@ public class UpdateWordFilterCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getWordFilter().reload(); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_update_wordfilter"), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateYoutubePlaylistsCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateYoutubePlaylistsCommand.java index 8811c016..9a48570a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UpdateYoutubePlaylistsCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UpdateYoutubePlaylistsCommand.java @@ -10,7 +10,7 @@ public class UpdateYoutubePlaylistsCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { Emulator.getGameEnvironment().getItemManager().getYoutubeManager().load(); gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_update_youtube_playlists"), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/UserInfoCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/UserInfoCommand.java index b5f7148e..92f14e57 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/UserInfoCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/UserInfoCommand.java @@ -19,7 +19,7 @@ public class UserInfoCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (params.length < 2) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_userinfo.forgot_username"), RoomChatMessageBubbles.ALERT); return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/WordQuizCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/WordQuizCommand.java index c66cb4b6..b116a49f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/WordQuizCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/WordQuizCommand.java @@ -12,7 +12,7 @@ public class WordQuizCommand extends Command { } @Override - public boolean handle(GameClient gameClient, String[] params) throws Exception { + public boolean handle(GameClient gameClient, String[] params) { if (!gameClient.getHabbo().getHabboInfo().getCurrentRoom().hasActiveWordQuiz()) { if(params.length == 1) { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.description.cmd_word_quiz"), RoomChatMessageBubbles.ALERT); diff --git a/src/main/java/com/eu/habbo/habbohotel/games/GamePlayer.java b/src/main/java/com/eu/habbo/habbohotel/games/GamePlayer.java index bfd82a59..b3653c11 100644 --- a/src/main/java/com/eu/habbo/habbohotel/games/GamePlayer.java +++ b/src/main/java/com/eu/habbo/habbohotel/games/GamePlayer.java @@ -3,25 +3,17 @@ package com.eu.habbo.habbohotel.games; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.wired.WiredHandler; import com.eu.habbo.habbohotel.wired.WiredTriggerType; +import lombok.RequiredArgsConstructor; +@RequiredArgsConstructor public class GamePlayer { private final Habbo habbo; - - - private GameTeamColors teamColor; - + private final GameTeamColors teamColor; private int score; private int wiredScore; - - public GamePlayer(Habbo habbo, GameTeamColors teamColor) { - this.habbo = habbo; - this.teamColor = teamColor; - } - - public void reset() { this.score = 0; this.wiredScore = 0; diff --git a/src/main/java/com/eu/habbo/habbohotel/games/tag/TagGame.java b/src/main/java/com/eu/habbo/habbohotel/games/tag/TagGame.java index f9ccdb67..bd612428 100644 --- a/src/main/java/com/eu/habbo/habbohotel/games/tag/TagGame.java +++ b/src/main/java/com/eu/habbo/habbohotel/games/tag/TagGame.java @@ -24,7 +24,7 @@ import gnu.trove.set.hash.THashSet; import java.util.Map; public abstract class TagGame extends Game { - public THashMap taggers = new THashMap<>(); + protected final THashMap taggers = new THashMap<>(); public TagGame(Class gameTeamClazz, Class gamePlayerClazz, Room room) { super(gameTeamClazz, gamePlayerClazz, room, false); diff --git a/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThread.java b/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThread.java index 64eb975a..89b003b0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThread.java +++ b/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThread.java @@ -180,7 +180,7 @@ public class ForumThread implements Runnable, ISerialize { return threads; } - public static ForumThread getById(int threadId) throws SQLException { + public static ForumThread getById(int threadId) { ForumThread foundThread = forumThreadsCache.get(threadId); if (foundThread != null) diff --git a/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThreadComment.java b/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThreadComment.java index 507ad8ef..9cfd6b93 100644 --- a/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThreadComment.java +++ b/src/main/java/com/eu/habbo/habbohotel/guilds/forums/ForumThreadComment.java @@ -89,7 +89,7 @@ public class ForumThreadComment implements Runnable, ISerialize { forumCommentsCache.clear(); } - public static ForumThreadComment create(ForumThread thread, Habbo poster, String message) throws Exception { + public static ForumThreadComment create(ForumThread thread, Habbo poster, String message) { ForumThreadComment createdComment = null; if (Emulator.getPluginManager().fireEvent(new GuildForumThreadCommentBeforeCreated(thread, poster, message)).isCancelled()) @@ -135,11 +135,7 @@ public class ForumThreadComment implements Runnable, ISerialize { } public ForumThread getThread() { - try { - return ForumThread.getById(this.threadId); - } catch (SQLException e) { - return null; - } + return ForumThread.getById(this.threadId); } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBackgroundToner.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBackgroundToner.java index 072eb40b..3a6b9cc2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBackgroundToner.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBackgroundToner.java @@ -90,7 +90,7 @@ public class InteractionBackgroundToner extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBadgeDisplay.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBadgeDisplay.java index 01b552f2..c34be7e5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBadgeDisplay.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionBadgeDisplay.java @@ -54,7 +54,7 @@ public class InteractionBadgeDisplay extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCannon.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCannon.java index 00ea3d9b..b1223794 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCannon.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCannon.java @@ -78,7 +78,7 @@ public class InteractionCannon extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionClothing.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionClothing.java index d9aaf6fb..9bcd0794 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionClothing.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionClothing.java @@ -29,7 +29,7 @@ public class InteractionClothing extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorWheel.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorWheel.java index 03259db7..2f57bec8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorWheel.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionColorWheel.java @@ -58,12 +58,12 @@ public class InteractionColorWheel extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @Override - public void onWalkOn(RoomUnit client, Room room, Object[] objects) throws Exception { + public void onWalkOn(RoomUnit client, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCrackable.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCrackable.java index 1be2594c..2ccdb52e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCrackable.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCrackable.java @@ -135,17 +135,17 @@ public class InteractionCrackable extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @Override - public void onWalkOn(RoomUnit client, Room room, Object[] objects) throws Exception { + public void onWalkOn(RoomUnit client, Room room, Object[] objects) { } @Override - public void onWalkOff(RoomUnit client, Room room, Object[] objects) throws Exception { + public void onWalkOff(RoomUnit client, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCustomValues.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCustomValues.java index 5a275c28..8f39af73 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCustomValues.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionCustomValues.java @@ -46,7 +46,7 @@ public abstract class InteractionCustomValues extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionDice.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionDice.java index aa938ee0..42948536 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionDice.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionDice.java @@ -57,8 +57,8 @@ public class InteractionDice extends HabboItem { room.updateItemState(this); Emulator.getThreading().run(this); - if (event.result > 0) { - Emulator.getThreading().run(new RandomDiceNumber(room, this, event.result), 1500); + if (event.getResult() > 0) { + Emulator.getThreading().run(new RandomDiceNumber(room, this, event.getResult()), 1500); } else { Emulator.getThreading().run(new RandomDiceNumber(this, room, this.getBaseItem().getStateCount()), 1500); } @@ -68,7 +68,7 @@ public class InteractionDice extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionExternalImage.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionExternalImage.java index b6a06826..f6fa36e8 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionExternalImage.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionExternalImage.java @@ -30,7 +30,7 @@ public class InteractionExternalImage extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @@ -43,7 +43,7 @@ public class InteractionExternalImage extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { } //{"t":10000000, "u":"http://arcturus.pw/camera/", "m":"idk", "s":1, "w":"http://arcturus.pw/camera/image.png"} diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionFXBox.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionFXBox.java index 1da31022..daf5ab50 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionFXBox.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionFXBox.java @@ -24,7 +24,7 @@ public class InteractionFXBox extends InteractionDefault { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (client != null && this.getUserId() == client.getHabbo().getHabboInfo().getId()) { if(this.getExtradata().equals("1")) return; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGift.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGift.java index 62f2a19e..712c6c4d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGift.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionGift.java @@ -69,7 +69,7 @@ public class InteractionGift extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { } @@ -84,7 +84,7 @@ public class InteractionGift extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHanditemTile.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHanditemTile.java index 286aa9f9..aa1eb152 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHanditemTile.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHanditemTile.java @@ -18,7 +18,7 @@ public class InteractionHanditemTile extends InteractionHanditem { } @Override - public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) { InteractionHanditemTile instance = this; Emulator.getThreading().run(() -> { if (roomUnit.getCurrentLocation().getX() == instance.getX() && roomUnit.getCurrentLocation().getY() == instance.getY()) { diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHopper.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHopper.java index aea5acbf..323e23a1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHopper.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionHopper.java @@ -43,7 +43,7 @@ public class InteractionHopper extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionJukeBox.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionJukeBox.java index bc5744cd..dec7b52a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionJukeBox.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionJukeBox.java @@ -38,7 +38,7 @@ public class InteractionJukeBox extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionLoveLock.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionLoveLock.java index 5904a18b..2369b288 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionLoveLock.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionLoveLock.java @@ -65,12 +65,12 @@ public class InteractionLoveLock extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (this.getExtradata().contains("\t")) return; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMannequin.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMannequin.java index e6a813c5..84adbbb1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMannequin.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMannequin.java @@ -65,7 +65,7 @@ public class InteractionMannequin extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { String[] data = this.getExtradata().split(":"); if(data.length < 2) @@ -104,17 +104,17 @@ public class InteractionMannequin extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @Override - public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) { } @Override - public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) { } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMoodLight.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMoodLight.java index ee30d1eb..0830cad5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMoodLight.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMoodLight.java @@ -39,7 +39,7 @@ public class InteractionMoodLight extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMusicDisc.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMusicDisc.java index ef9914a0..39eb0b27 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMusicDisc.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMusicDisc.java @@ -62,7 +62,7 @@ public class InteractionMusicDisc extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMuteArea.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMuteArea.java index b8b1ac03..e7d6fc43 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMuteArea.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMuteArea.java @@ -21,7 +21,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class InteractionMuteArea extends InteractionCustomValues { - public static THashMap defaultValues = new THashMap<>() { + public static final THashMap defaultValues = new THashMap<>() { { this.put("tilesLeft", "0"); } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionObstacle.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionObstacle.java index e6b008d5..a782efd5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionObstacle.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionObstacle.java @@ -55,7 +55,7 @@ public class InteractionObstacle extends HabboItem implements ICycleable { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { /*Pet pet = room.getPet(roomUnit); if (pet instanceof HorsePet && ((HorsePet) pet).getRider() != null) { diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionOneWayGate.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionOneWayGate.java index 22c822aa..d2f559cb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionOneWayGate.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionOneWayGate.java @@ -42,7 +42,7 @@ public class InteractionOneWayGate extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPostIt.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPostIt.java index b7038613..ae9b8872 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPostIt.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPostIt.java @@ -31,7 +31,7 @@ public class InteractionPostIt extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPoster.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPoster.java index d734d3ad..bdb3afd4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPoster.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPoster.java @@ -29,7 +29,7 @@ public class InteractionPoster extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPressurePlate.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPressurePlate.java index 9176cecf..8919d7f0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPressurePlate.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPressurePlate.java @@ -33,7 +33,7 @@ public class InteractionPressurePlate extends InteractionDefault { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPuzzleBox.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPuzzleBox.java index 3de816b5..36250f87 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPuzzleBox.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPuzzleBox.java @@ -92,7 +92,7 @@ public class InteractionPuzzleBox extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPyramid.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPyramid.java index 2055b38b..0ec3ce19 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPyramid.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPyramid.java @@ -41,7 +41,7 @@ public class InteractionPyramid extends InteractionGate { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java index feb28cab..73e4053c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRentableSpace.java @@ -93,7 +93,7 @@ public class InteractionRentableSpace extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { this.sendRentWidget(client.getHabbo()); } @@ -103,7 +103,7 @@ public class InteractionRentableSpace extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoller.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoller.java index 10489695..c2e7ea41 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoller.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoller.java @@ -16,7 +16,7 @@ import java.util.List; public class InteractionRoller extends HabboItem { public static boolean NO_RULES = false; - public static int DELAY = 400; + public static final int DELAY = 400; public InteractionRoller(ResultSet set, Item baseItem) throws SQLException { super(set, baseItem); @@ -52,7 +52,7 @@ public class InteractionRoller extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoomOMatic.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoomOMatic.java index 3cbf73cb..8384d916 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoomOMatic.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionRoomOMatic.java @@ -18,7 +18,7 @@ public class InteractionRoomOMatic extends InteractionDefault { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (client != null) { client.sendResponse(new NoOwnedRoomsAlertMessageComposer()); } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSnowboardSlope.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSnowboardSlope.java index 09b3292b..987bea3a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSnowboardSlope.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionSnowboardSlope.java @@ -26,7 +26,7 @@ public class InteractionSnowboardSlope extends InteractionMultiHeight { } @Override - public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) { room.giveEffect(roomUnit, 97, -1); } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionStackHelper.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionStackHelper.java index 5955665f..669a5a69 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionStackHelper.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionStackHelper.java @@ -29,7 +29,7 @@ public class InteractionStackHelper extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTeleport.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTeleport.java index 64af3bfa..0a988e15 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTeleport.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTeleport.java @@ -138,14 +138,14 @@ public class InteractionTeleport extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (room != null && client != null && objects != null && objects.length <= 1) { tryTeleport(client, room); } } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTeleportTile.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTeleportTile.java index fc8e7b51..7d38fa98 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTeleportTile.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTeleportTile.java @@ -28,7 +28,7 @@ public class InteractionTeleportTile extends InteractionTeleport { } @Override - public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) { if (roomUnit != null && this.canWalkOn(roomUnit, room, objects)) { Habbo habbo = room.getHabbo(roomUnit); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTent.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTent.java index 7ded66c2..e295e4b2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTent.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTent.java @@ -17,7 +17,7 @@ public class InteractionTent extends InteractionDefault { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { // do nothing } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTileEffectProvider.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTileEffectProvider.java index bda95b66..dd9fba6b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTileEffectProvider.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTileEffectProvider.java @@ -10,7 +10,7 @@ import java.sql.ResultSet; import java.sql.SQLException; public class InteractionTileEffectProvider extends InteractionCustomValues { - public static THashMap defaultValues = new THashMap<>() { + public static final THashMap defaultValues = new THashMap<>() { { this.put("effectId", "0"); } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTrap.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTrap.java index cf1a3782..1ea1eb16 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTrap.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionTrap.java @@ -60,7 +60,7 @@ public class InteractionTrap extends InteractionDefault { } @Override - public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) { } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVendingMachine.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVendingMachine.java index f6e272b1..6bccfc83 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVendingMachine.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVendingMachine.java @@ -98,7 +98,7 @@ public class InteractionVendingMachine extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (client == null) { return; } @@ -142,7 +142,7 @@ public class InteractionVendingMachine extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVikingCotie.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVikingCotie.java index 1df011f5..b79a675b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVikingCotie.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVikingCotie.java @@ -19,7 +19,7 @@ public class InteractionVikingCotie extends InteractionDefault { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (this.getExtradata().isEmpty()) { this.setExtradata("0"); } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVoteCounter.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVoteCounter.java index 6c8f1538..a28b30b4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVoteCounter.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionVoteCounter.java @@ -67,7 +67,7 @@ public class InteractionVoteCounter extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (room == null || !((client != null && room.hasRights(client.getHabbo())) || (objects.length >= 2 && objects[1] instanceof WiredEffectType))) return; @@ -84,7 +84,7 @@ public class InteractionVoteCounter extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredCondition.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredCondition.java index ef63491f..df4fbd0d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredCondition.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredCondition.java @@ -32,7 +32,7 @@ public abstract class InteractionWiredCondition extends InteractionWired { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (client != null) { if (room.hasRights(client.getHabbo())) { client.sendResponse(new WiredConditionDataComposer(this, room)); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredExtra.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredExtra.java index b946d7d9..c29cf0a6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredExtra.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredExtra.java @@ -18,7 +18,7 @@ public abstract class InteractionWiredExtra extends InteractionWired { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (client != null) { if (room.hasRights(client.getHabbo())) { this.activateBox(room); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredHighscore.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredHighscore.java index 3162ddb3..d8b3a9dc 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredHighscore.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredHighscore.java @@ -75,12 +75,12 @@ public class InteractionWiredHighscore extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (room == null || !((client != null && room.hasRights(client.getHabbo())) || (objects.length >= 2 && objects[1] instanceof WiredEffectType))) return; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredTrigger.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredTrigger.java index 528c6b80..db67dd84 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredTrigger.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionWiredTrigger.java @@ -33,7 +33,7 @@ public abstract class InteractionWiredTrigger extends InteractionWired { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (client != null) { if (room.hasRights(client.getHabbo())) { client.sendResponse(new WiredTriggerDataComposer(this, room)); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionYoutubeTV.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionYoutubeTV.java index de3d5b1a..6f2ff036 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionYoutubeTV.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionYoutubeTV.java @@ -41,7 +41,7 @@ public class InteractionYoutubeTV extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java index ee0085f8..a4b6d0c4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/InteractionGameTimer.java @@ -289,7 +289,7 @@ public class InteractionGameTimer extends HabboItem implements Runnable { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiSphere.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiSphere.java index 8494b4c7..77954520 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiSphere.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiSphere.java @@ -39,6 +39,6 @@ public class InteractionBattleBanzaiSphere extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTeleporter.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTeleporter.java index 98a627fe..5b7580a7 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTeleporter.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTeleporter.java @@ -43,12 +43,12 @@ public class InteractionBattleBanzaiTeleporter extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTile.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTile.java index 7eda506b..d2583d9e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTile.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTile.java @@ -46,7 +46,7 @@ public class InteractionBattleBanzaiTile extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/gates/InteractionBattleBanzaiGate.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/gates/InteractionBattleBanzaiGate.java index b846acf4..cbc343df 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/gates/InteractionBattleBanzaiGate.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/gates/InteractionBattleBanzaiGate.java @@ -29,7 +29,7 @@ public class InteractionBattleBanzaiGate extends InteractionGameGate { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/scoreboards/InteractionBattleBanzaiScoreboard.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/scoreboards/InteractionBattleBanzaiScoreboard.java index e3b8c24f..f34584b4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/scoreboards/InteractionBattleBanzaiScoreboard.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/scoreboards/InteractionBattleBanzaiScoreboard.java @@ -29,7 +29,7 @@ public class InteractionBattleBanzaiScoreboard extends InteractionGameScoreboard } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootballGate.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootballGate.java index b033118b..50a232ec 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootballGate.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/InteractionFootballGate.java @@ -121,7 +121,7 @@ public class InteractionFootballGate extends HabboItem { UserSavedLookEvent lookEvent = new UserSavedLookEvent(habbo, habbo.getHabboInfo().getGender(), oldlook); Emulator.getPluginManager().fireEvent(lookEvent); if (!lookEvent.isCancelled()) { - habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook); + habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.getNewLook(), lookEvent.getGender().name()) : lookEvent.getNewLook()); Emulator.getThreading().run(habbo.getHabboInfo()); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo)); room.sendComposer(new UserChangeMessageComposer(habbo).compose()); @@ -135,7 +135,7 @@ public class InteractionFootballGate extends HabboItem { Emulator.getPluginManager().fireEvent(lookEvent); if (!lookEvent.isCancelled()) { habbo.getHabboStats().getCache().put(CACHE_KEY, habbo.getHabboInfo().getLook()); - habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook); + habbo.getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_FBALLGATE ? ClothingValidationManager.validateLook(habbo, lookEvent.getNewLook(), lookEvent.getGender().name()) : lookEvent.getNewLook()); Emulator.getThreading().run(habbo.getHabboInfo()); habbo.getClient().sendResponse(new FigureUpdateComposer(habbo)); room.sendComposer(new UserChangeMessageComposer(habbo).compose()); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/goals/InteractionFootballGoal.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/goals/InteractionFootballGoal.java index a3ef5202..443bb720 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/goals/InteractionFootballGoal.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/goals/InteractionFootballGoal.java @@ -30,7 +30,7 @@ public class InteractionFootballGoal extends InteractionGameTeamItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/scoreboards/InteractionFootballScoreboard.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/scoreboards/InteractionFootballScoreboard.java index e142f113..dba5f039 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/scoreboards/InteractionFootballScoreboard.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/football/scoreboards/InteractionFootballScoreboard.java @@ -111,17 +111,17 @@ public class InteractionFootballScoreboard extends InteractionGameScoreboard { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @Override - public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) { } @Override - public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) { } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeBlock.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeBlock.java index abbd2f3a..673e6e83 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeBlock.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeBlock.java @@ -29,7 +29,7 @@ public class InteractionFreezeBlock extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (client == null) return; @@ -76,7 +76,7 @@ public class InteractionFreezeBlock extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeExitTile.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeExitTile.java index cf07b29f..de76eeef 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeExitTile.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeExitTile.java @@ -36,7 +36,7 @@ public class InteractionFreezeExitTile extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeTile.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeTile.java index 678afd3d..d46b3c82 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeTile.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/InteractionFreezeTile.java @@ -37,7 +37,7 @@ public class InteractionFreezeTile extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (client == null) return; @@ -50,7 +50,7 @@ public class InteractionFreezeTile extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/gates/InteractionFreezeGate.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/gates/InteractionFreezeGate.java index b2d75882..e135e7d1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/gates/InteractionFreezeGate.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/gates/InteractionFreezeGate.java @@ -29,7 +29,7 @@ public class InteractionFreezeGate extends InteractionGameGate { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/scoreboards/InteractionFreezeScoreboard.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/scoreboards/InteractionFreezeScoreboard.java index 2baee005..5f8d510d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/scoreboards/InteractionFreezeScoreboard.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/freeze/scoreboards/InteractionFreezeScoreboard.java @@ -29,7 +29,7 @@ public class InteractionFreezeScoreboard extends InteractionGameScoreboard { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/tag/InteractionTagField.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/tag/InteractionTagField.java index 2e97d3f9..53c8dd7b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/tag/InteractionTagField.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/tag/InteractionTagField.java @@ -44,7 +44,7 @@ public abstract class InteractionTagField extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/tag/InteractionTagPole.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/tag/InteractionTagPole.java index 0b9598e0..d9aa71c6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/tag/InteractionTagPole.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/tag/InteractionTagPole.java @@ -29,7 +29,7 @@ public class InteractionTagPole extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionMonsterPlantSeed.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionMonsterPlantSeed.java index cbd2ea22..b92511cd 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionMonsterPlantSeed.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionMonsterPlantSeed.java @@ -55,7 +55,7 @@ public class InteractionMonsterPlantSeed extends HabboItem { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { } @Override @@ -69,7 +69,7 @@ public class InteractionMonsterPlantSeed extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java index 3f3448b8..9cd0adf5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java @@ -48,7 +48,7 @@ public class InteractionNest extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java index c29af75c..84c4da58 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java @@ -51,12 +51,12 @@ public class InteractionPetBreedingNest extends HabboItem { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } @Override - public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOn(RoomUnit roomUnit, Room room, Object[] objects) { Pet pet = room.getPet(roomUnit); if (pet != null) { @@ -96,7 +96,7 @@ public class InteractionPetBreedingNest extends HabboItem { } @Override - public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalkOff(RoomUnit roomUnit, Room room, Object[] objects) { if (this.petOne != null && this.petOne.getRoomUnit() == roomUnit) this.petOne = null; if (this.petTwo != null && this.petTwo.getRoomUnit() == roomUnit) this.petTwo = null; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java index e667e4fd..3e08adc6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java @@ -36,7 +36,7 @@ public class InteractionPetDrink extends InteractionDefault { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (client == null) return; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemHead.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemHead.java index c54cd768..a016a1a2 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemHead.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemHead.java @@ -73,7 +73,7 @@ public class InteractionTotemHead extends InteractionDefault { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (!((client != null && room != null && room.hasRights(client.getHabbo())) || (objects.length >= 2 && objects[1] instanceof WiredEffectType))) return; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionGroupMember.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionGroupMember.java index acab259f..d9c1d1ad 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionGroupMember.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionGroupMember.java @@ -39,7 +39,7 @@ public class WiredConditionGroupMember extends InteractionWiredCondition { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHabboHasHandItem.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHabboHasHandItem.java index f56c0f5d..5f7f8b0f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHabboHasHandItem.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionHabboHasHandItem.java @@ -71,7 +71,7 @@ public class WiredConditionHabboHasHandItem extends InteractionWiredCondition { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { try { String wiredData = set.getString("wired_data"); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInGroup.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInGroup.java index 55d284ab..2a6a0458 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInGroup.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInGroup.java @@ -39,7 +39,7 @@ public class WiredConditionNotInGroup extends InteractionWiredCondition { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInTeam.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInTeam.java index 9795a9a4..fdd025cf 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInTeam.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionNotInTeam.java @@ -46,7 +46,7 @@ public class WiredConditionNotInTeam extends InteractionWiredCondition { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { try { String wiredData = set.getString("wired_data"); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTeamMember.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTeamMember.java index 751dd4d5..d78a616b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTeamMember.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionTeamMember.java @@ -48,7 +48,7 @@ public class WiredConditionTeamMember extends InteractionWiredCondition { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { try { String wiredData = set.getString("wired_data"); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveReward.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveReward.java index bfe6afdf..3383270f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveReward.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveReward.java @@ -17,26 +17,28 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.wired.WiredSaveException; import com.eu.habbo.messages.outgoing.generic.alerts.WiredValidationErrorComposer; import gnu.trove.set.hash.THashSet; +import lombok.Getter; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +@Getter public class WiredEffectGiveReward extends InteractionWiredEffect { public final static int LIMIT_ONCE = 0; public final static int LIMIT_N_DAY = 1; public final static int LIMIT_N_HOURS = 2; public final static int LIMIT_N_MINUTES = 3; - public final static WiredEffectType type = WiredEffectType.GIVE_REWARD; - public int limit; - public int limitationInterval; - public int given; - public int rewardTime; - public boolean uniqueRewards; + private final static WiredEffectType type = WiredEffectType.GIVE_REWARD; + private int limit; + private int limitationInterval; + private int given; + private int rewardTime; + private boolean uniqueRewards; - public THashSet rewardItems = new THashSet<>(); + private final THashSet rewardItems = new THashSet<>(); public WiredEffectGiveReward(ResultSet set, Item baseItem) throws SQLException { super(set, baseItem); @@ -64,7 +66,7 @@ public class WiredEffectGiveReward extends InteractionWiredEffect { public void loadWiredData(ResultSet set, Room room) throws SQLException { String wiredData = set.getString("wired_data"); - if(wiredData.startsWith("{")) { + if (wiredData.startsWith("{")) { JsonData data = WiredHandler.getGsonBuilder().create().fromJson(wiredData, JsonData.class); this.setDelay(data.delay); this.limit = data.limit; @@ -74,8 +76,7 @@ public class WiredEffectGiveReward extends InteractionWiredEffect { this.limitationInterval = data.limit_interval; this.rewardItems.clear(); this.rewardItems.addAll(data.rewards); - } - else { + } else { String[] data = wiredData.split(":"); if (data.length > 0) { this.limit = Integer.parseInt(data[0]); @@ -172,7 +173,7 @@ public class WiredEffectGiveReward extends InteractionWiredEffect { @Override public boolean saveData(WiredSettings settings, GameClient gameClient) throws WiredSaveException { if (gameClient.getHabbo().hasPermission(Permission.ACC_SUPERWIRED)) { - if(settings.getIntParams().length < 4) throw new WiredSaveException("Invalid data"); + if (settings.getIntParams().length < 4) throw new WiredSaveException("Invalid data"); this.rewardTime = settings.getIntParams()[0]; this.uniqueRewards = settings.getIntParams()[1] == 1; this.limit = settings.getIntParams()[2]; @@ -220,6 +221,10 @@ public class WiredEffectGiveReward extends InteractionWiredEffect { return 0; } + public void incrementGiven() { + given++; + } + static class JsonData { int limit; int given; @@ -239,4 +244,6 @@ public class WiredEffectGiveReward extends InteractionWiredEffect { this.delay = delay; } } + + } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveScoreToTeam.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveScoreToTeam.java index b1d62b4e..00b483f0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveScoreToTeam.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectGiveScoreToTeam.java @@ -27,7 +27,7 @@ public class WiredEffectGiveScoreToTeam extends InteractionWiredEffect { private int count; private GameTeamColors teamColor = GameTeamColors.RED; - private TIntIntHashMap startTimes = new TIntIntHashMap(); + private final TIntIntHashMap startTimes = new TIntIntHashMap(); public WiredEffectGiveScoreToTeam(int id, int userId, Item item, String extradata, int limitedStack, int limitedSells) { super(id, userId, item, extradata, limitedStack, limitedSells); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMatchFurni.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMatchFurni.java index 5d827ded..ab995a51 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMatchFurni.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMatchFurni.java @@ -27,7 +27,7 @@ import java.util.regex.Pattern; public class WiredEffectMatchFurni extends InteractionWiredEffect implements InteractionWiredMatchFurniSettings { private static final WiredEffectType type = WiredEffectType.MATCH_SSHOT; - public boolean checkForWiredResetPermission = true; + private final boolean checkForWiredResetPermission = true; private final THashSet settings; private boolean state = false; private boolean direction = false; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java index 6d0f8fd0..e22eee70 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectMoveFurniTo.java @@ -29,7 +29,7 @@ public class WiredEffectMoveFurniTo extends InteractionWiredEffect { private final List items = new ArrayList<>(); private int direction; private int spacing = 1; - private Map indexOffset = new LinkedHashMap<>(); + private final Map indexOffset = new LinkedHashMap<>(); public WiredEffectMoveFurniTo(ResultSet set, Item baseItem) throws SQLException { super(set, baseItem); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredBlob.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredBlob.java index acf9fa33..730abc0c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredBlob.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredBlob.java @@ -80,7 +80,7 @@ public class WiredBlob extends InteractionDefault { } @Override - public void onClick(GameClient client, Room room, Object[] objects) throws Exception { + public void onClick(GameClient client, Room room, Object[] objects) { if (!this.RESETS_WITH_GAME && objects != null && objects.length == 2 && objects[1].equals(WiredEffectType.TOGGLE_STATE) && room.getGames().stream().anyMatch(game -> game.getState().equals(GameState.RUNNING) || game.getState().equals(GameState.PAUSED))) { this.setExtradata(this.getExtradata().equals(WiredBlobState.ACTIVE.getState()) ? WiredBlobState.USED.getState() : WiredBlobState.ACTIVE.getState()); room.updateItem(this); diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredExtraRandom.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredExtraRandom.java index b8d8e3bf..55b01606 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredExtraRandom.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredExtraRandom.java @@ -34,7 +34,7 @@ public class WiredExtraRandom extends InteractionWiredExtra { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { } @@ -44,7 +44,7 @@ public class WiredExtraRandom extends InteractionWiredExtra { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredExtraUnseen.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredExtraUnseen.java index a7b04568..b3931aa3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredExtraUnseen.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/extra/WiredExtraUnseen.java @@ -7,14 +7,16 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.messages.ServerMessage; +import lombok.Getter; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +@Getter public class WiredExtraUnseen extends InteractionWiredExtra { - public List seenList = new ArrayList<>(); + private final List seenList = new ArrayList<>(); public WiredExtraUnseen(ResultSet set, Item baseItem) throws SQLException { super(set, baseItem); @@ -40,7 +42,7 @@ public class WiredExtraUnseen extends InteractionWiredExtra { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { } @@ -50,7 +52,7 @@ public class WiredExtraUnseen extends InteractionWiredExtra { } @Override - public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) throws Exception { + public void onWalk(RoomUnit roomUnit, Room room, Object[] objects) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerCollision.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerCollision.java index 11f46a8a..317ac801 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerCollision.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerCollision.java @@ -35,7 +35,7 @@ public class WiredTriggerCollision extends InteractionWiredTrigger { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { } diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerGameEnds.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerGameEnds.java index b8b9459b..3de40ee4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerGameEnds.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerGameEnds.java @@ -35,7 +35,7 @@ public class WiredTriggerGameEnds extends InteractionWiredTrigger { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerGameStarts.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerGameStarts.java index bd565f8a..22ad69fe 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerGameStarts.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/triggers/WiredTriggerGameStarts.java @@ -37,7 +37,7 @@ public class WiredTriggerGameStarts extends InteractionWiredTrigger { } @Override - public void loadWiredData(ResultSet set, Room room) throws SQLException { + public void loadWiredData(ResultSet set, Room room) { } @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolBan.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolBan.java index 1515f324..af80afab 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolBan.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolBan.java @@ -14,18 +14,18 @@ import java.text.SimpleDateFormat; @Getter public class ModToolBan implements Runnable { - public static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - private int userId; - private String ip; - private String machineId; - private int staffId; - private int expireDate; - private int timestamp; - private String reason; - private ModToolBanType type; - private int cfhTopic; + public static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + private final int userId; + private final String ip; + private final String machineId; + private final int staffId; + private final int expireDate; + private final int timestamp; + private final String reason; + private final ModToolBanType type; + private final int cfhTopic; - private boolean needsInsert; + private final boolean needsInsert; public ModToolBan(ResultSet set) throws SQLException { this.userId = set.getInt("user_id"); diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolChatLog.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolChatLog.java index 636ec815..7407dbc6 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolChatLog.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolChatLog.java @@ -9,10 +9,10 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public class ModToolChatLog implements Comparable { private final int timestamp; - private final int habboId; - private final String username; - private final String message; - private boolean highlighted = false; + private final int habboId; + private final String username; + private final String message; + private boolean highlighted = false; @Override diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java index 3656c48f..592409d9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java @@ -397,7 +397,7 @@ public class ModToolManager { return; if (target != null) - alertedEvent.target.getClient().sendResponse(new IssueCloseNotificationMessageComposer(alertedEvent.message)); + alertedEvent.getTarget().getClient().sendResponse(new IssueCloseNotificationMessageComposer(alertedEvent.getMessage())); } public void kick(Habbo moderator, Habbo target, String message) { @@ -471,17 +471,17 @@ public class ModToolManager { SupportRoomActionEvent roomActionEvent = new SupportRoomActionEvent(moderator, room, kickUsers, lockDoor, changeTitle); Emulator.getPluginManager().fireEvent(roomActionEvent); - if (roomActionEvent.changeTitle) { + if (roomActionEvent.isChangeTitle()) { room.setName(Emulator.getTexts().getValue("hotel.room.inappropriate.title")); room.setNeedsUpdate(true); } - if (roomActionEvent.lockDoor) { + if (roomActionEvent.isLockDoor()) { room.setState(RoomState.LOCKED); room.setNeedsUpdate(true); } - if (roomActionEvent.kickUsers) { + if (roomActionEvent.isKickUsers()) { for (Habbo habbo : room.getHabbos()) { if (!(habbo.hasPermission(Permission.ACC_UNKICKABLE) || habbo.hasPermission(Permission.ACC_SUPPORTTOOL) || room.isOwner(habbo))) { room.kickHabbo(habbo, false); diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolRoomVisit.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolRoomVisit.java index 42197409..b78229b0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolRoomVisit.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolRoomVisit.java @@ -13,8 +13,7 @@ public class ModToolRoomVisit implements Comparable { private final String roomName; private final int timestamp; private int exitTimestamp; - private THashSet chat = new THashSet<>(); - ; + private final THashSet chat = new THashSet<>(); public ModToolRoomVisit(ResultSet set) throws SQLException { this.roomId = set.getInt("room_id"); diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctionItem.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctionItem.java index 90bd9ed2..af739967 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctionItem.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctionItem.java @@ -1,28 +1,17 @@ package com.eu.habbo.habbohotel.modtool; +import lombok.AllArgsConstructor; import lombok.Getter; @Getter +@AllArgsConstructor public class ModToolSanctionItem { - private int id; - private int habboId; - private int sanctionLevel; - private int probationTimestamp; - private boolean isMuted; - private int muteDuration; - private int tradeLockedUntil; - private String reason; - - public ModToolSanctionItem(int id, int habboId, int sanctionLevel, int probationTimestamp, boolean isMuted, int muteDuration, int tradeLockedUntil, String reason) { - this.id = id; - this.habboId = habboId; - this.sanctionLevel = sanctionLevel; - this.probationTimestamp = probationTimestamp; - this.isMuted = isMuted; - this.muteDuration = muteDuration; - this.tradeLockedUntil = tradeLockedUntil; - this.reason = reason; - } - - + private final int id; + private final int habboId; + private final int sanctionLevel; + private final int probationTimestamp; + private final boolean isMuted; + private final int muteDuration; + private final int tradeLockedUntil; + private final String reason; } diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctionLevelItem.java b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctionLevelItem.java index 362a3d46..03e31b1f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctionLevelItem.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolSanctionLevelItem.java @@ -1,18 +1,14 @@ package com.eu.habbo.habbohotel.modtool; +import lombok.AllArgsConstructor; import lombok.Getter; @Getter +@AllArgsConstructor public class ModToolSanctionLevelItem { - private int sanctionLevel; - private String sanctionType; - private int sanctionHourLength; - private int sanctionProbationDays; + private final int sanctionLevel; + private final String sanctionType; + private final int sanctionHourLength; + private final int sanctionProbationDays; - public ModToolSanctionLevelItem(int sanctionLevel, String sanctionType, int sanctionHourLength, int sanctionProbationDays) { - this.sanctionLevel = sanctionLevel; - this.sanctionType = sanctionType; - this.sanctionHourLength = sanctionHourLength; - this.sanctionProbationDays = sanctionProbationDays; - } } diff --git a/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java b/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java index 66762361..a732d967 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/WordFilter.java @@ -25,9 +25,9 @@ public class WordFilter { //Configuration. Loaded from database & updated accordingly. public static boolean ENABLED_FRIENDCHAT = true; public static String DEFAULT_REPLACEMENT = "bobba"; - protected THashSet autoReportWords = new THashSet<>(); - protected THashSet hideMessageWords = new THashSet<>(); - protected THashSet words = new THashSet<>(); + protected final THashSet autoReportWords = new THashSet<>(); + protected final THashSet hideMessageWords = new THashSet<>(); + protected final THashSet words = new THashSet<>(); public WordFilter() { long start = System.currentTimeMillis(); diff --git a/src/main/java/com/eu/habbo/habbohotel/permissions/Permission.java b/src/main/java/com/eu/habbo/habbohotel/permissions/Permission.java index 17931826..1497b33e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/permissions/Permission.java +++ b/src/main/java/com/eu/habbo/habbohotel/permissions/Permission.java @@ -6,48 +6,48 @@ import lombok.Getter; @Getter @AllArgsConstructor public class Permission { - public static String ACC_ANYCHATCOLOR = "acc_anychatcolor"; // allows them to pick and choose any color from the chat bubbles. - public static String ACC_ANYROOMOWNER = "acc_anyroomowner"; - public static String ACC_EMPTY_OTHERS = "acc_empty_others"; - public static String ACC_ENABLE_OTHERS = "acc_enable_others"; - public static String ACC_SEE_WHISPERS = "acc_see_whispers"; - public static String ACC_SEE_TENTCHAT = "acc_see_tentchat"; - public static String ACC_SUPERWIRED = "acc_superwired"; - public static String ACC_SUPPORTTOOL = "acc_supporttool"; - public static String ACC_UNKICKABLE = "acc_unkickable"; - public static String ACC_GUILDGATE = "acc_guildgate"; - public static String ACC_MOVEROTATE = "acc_moverotate"; - public static String ACC_PLACEFURNI = "acc_placefurni"; - public static String ACC_UNLIMITED_BOTS = "acc_unlimited_bots"; - public static String ACC_UNLIMITED_PETS = "acc_unlimited_pets"; - public static String ACC_HIDE_IP = "acc_hide_ip"; - public static String ACC_HIDE_MAIL = "acc_hide_mail"; - public static String ACC_NOT_MIMICED = "acc_not_mimiced"; - public static String ACC_CHAT_NO_FLOOD = "acc_chat_no_flood"; - public static String ACC_STAFF_PICK = "acc_staff_pick"; - public static String ACC_ENTERANYROOM = "acc_enteranyroom"; // - public static String ACC_FULLROOMS = "acc_fullrooms"; - public static String ACC_INFINITE_CREDITS = "acc_infinite_credits"; - public static String ACC_INFINITE_PIXELS = "acc_infinite_pixels"; - public static String ACC_INFINITE_POINTS = "acc_infinite_points"; - public static String ACC_AMBASSADOR = "acc_ambassador"; - public static String ACC_CHAT_NO_LIMIT = "acc_chat_no_limit"; - public static String ACC_CHAT_NO_FILTER = "acc_chat_no_filter"; - public static String ACC_NOMUTE = "acc_nomute"; - public static String ACC_GUILD_ADMIN = "acc_guild_admin"; - public static String ACC_CATALOG_IDS = "acc_catalog_ids"; - public static String ACC_MODTOOL_TICKET_Q = "acc_modtool_ticket_q"; - public static String ACC_MODTOOL_USER_LOGS = "acc_modtool_user_logs"; - public static String ACC_MODTOOL_USER_ALERT = "acc_modtool_user_alert"; - public static String ACC_MODTOOL_USER_KICK = "acc_modtool_user_kick"; - public static String ACC_MODTOOL_USER_BAN = "acc_modtool_user_ban"; - public static String ACC_MODTOOL_ROOM_INFO = "acc_modtool_room_info"; - public static String ACC_MODTOOL_ROOM_LOGS = "acc_modtool_room_logs"; - public static String ACC_TRADE_ANYWHERE = "acc_trade_anywhere"; - public static String ACC_HELPER_USE_GUIDE_TOOL = "acc_helper_use_guide_tool"; - public static String ACC_HELPER_GIVE_GUIDE_TOURS = "acc_helper_give_guide_tours"; - public static String ACC_HELPER_JUDGE_CHAT_REVIEWS = "acc_helper_judge_chat_reviews"; - public static String ACC_FLOORPLAN_EDITOR = "acc_floorplan_editor"; + public static final String ACC_ANYCHATCOLOR = "acc_anychatcolor"; // allows them to pick and choose any color from the chat bubbles. + public static final String ACC_ANYROOMOWNER = "acc_anyroomowner"; + public static final String ACC_EMPTY_OTHERS = "acc_empty_others"; + public static final String ACC_ENABLE_OTHERS = "acc_enable_others"; + public static final String ACC_SEE_WHISPERS = "acc_see_whispers"; + public static final String ACC_SEE_TENTCHAT = "acc_see_tentchat"; + public static final String ACC_SUPERWIRED = "acc_superwired"; + public static final String ACC_SUPPORTTOOL = "acc_supporttool"; + public static final String ACC_UNKICKABLE = "acc_unkickable"; + public static final String ACC_GUILDGATE = "acc_guildgate"; + public static final String ACC_MOVEROTATE = "acc_moverotate"; + public static final String ACC_PLACEFURNI = "acc_placefurni"; + public static final String ACC_UNLIMITED_BOTS = "acc_unlimited_bots"; + public static final String ACC_UNLIMITED_PETS = "acc_unlimited_pets"; + public static final String ACC_HIDE_IP = "acc_hide_ip"; + public static final String ACC_HIDE_MAIL = "acc_hide_mail"; + public static final String ACC_NOT_MIMICED = "acc_not_mimiced"; + public static final String ACC_CHAT_NO_FLOOD = "acc_chat_no_flood"; + public static final String ACC_STAFF_PICK = "acc_staff_pick"; + public static final String ACC_ENTERANYROOM = "acc_enteranyroom"; // + public static final String ACC_FULLROOMS = "acc_fullrooms"; + public static final String ACC_INFINITE_CREDITS = "acc_infinite_credits"; + public static final String ACC_INFINITE_PIXELS = "acc_infinite_pixels"; + public static final String ACC_INFINITE_POINTS = "acc_infinite_points"; + public static final String ACC_AMBASSADOR = "acc_ambassador"; + public static final String ACC_CHAT_NO_LIMIT = "acc_chat_no_limit"; + public static final String ACC_CHAT_NO_FILTER = "acc_chat_no_filter"; + public static final String ACC_NOMUTE = "acc_nomute"; + public static final String ACC_GUILD_ADMIN = "acc_guild_admin"; + public static final String ACC_CATALOG_IDS = "acc_catalog_ids"; + public static final String ACC_MODTOOL_TICKET_Q = "acc_modtool_ticket_q"; + public static final String ACC_MODTOOL_USER_LOGS = "acc_modtool_user_logs"; + public static final String ACC_MODTOOL_USER_ALERT = "acc_modtool_user_alert"; + public static final String ACC_MODTOOL_USER_KICK = "acc_modtool_user_kick"; + public static final String ACC_MODTOOL_USER_BAN = "acc_modtool_user_ban"; + public static final String ACC_MODTOOL_ROOM_INFO = "acc_modtool_room_info"; + public static final String ACC_MODTOOL_ROOM_LOGS = "acc_modtool_room_logs"; + public static final String ACC_TRADE_ANYWHERE = "acc_trade_anywhere"; + public static final String ACC_HELPER_USE_GUIDE_TOOL = "acc_helper_use_guide_tool"; + public static final String ACC_HELPER_GIVE_GUIDE_TOURS = "acc_helper_give_guide_tours"; + public static final String ACC_HELPER_JUDGE_CHAT_REVIEWS = "acc_helper_judge_chat_reviews"; + public static final String ACC_FLOORPLAN_EDITOR = "acc_floorplan_editor"; private final String key; private final PermissionSetting setting; diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java b/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java index 2732ecd7..5b79f107 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/MonsterplantPet.java @@ -59,8 +59,8 @@ public class MonsterplantPet extends Pet implements IPetLook { }; public static final ArrayList> indexedBody = new ArrayList<>(MonsterplantPet.bodyRarity.values()); public static final ArrayList> indexedColors = new ArrayList<>(MonsterplantPet.colorRarity.values()); - public static int growTime = (30 * 60); - public static int timeToLive = (3 * 24 * 60 * 60); //3 days + public static final int growTime = (30 * 60); + public static final int timeToLive = (3 * 24 * 60 * 60); //3 days private final int nose; private final int noseColor; private final int eyes; @@ -68,8 +68,8 @@ public class MonsterplantPet extends Pet implements IPetLook { private final int mouth; private final int mouthColor; public String look; - private int type; - private int hue; + private final int type; + private final int hue; private int deathTimestamp = Emulator.getIntUnixTimestamp() + timeToLive; private boolean canBreed = true; private boolean publiclyBreedable = false; @@ -170,6 +170,7 @@ public class MonsterplantPet extends Pet implements IPetLook { for (RoomUnitStatus s : this.roomUnit.getStatusMap().keySet()) { if (s.equals(RoomUnitStatus.GROW)) { clear = true; + break; } } diff --git a/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java b/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java index 5619a116..dee88e8e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/pets/PetManager.java @@ -27,7 +27,7 @@ import java.util.Map; public class PetManager { public static int MAXIMUM_PET_INVENTORY_SIZE = 25; public static final int[] experiences = new int[]{100, 200, 400, 600, 900, 1300, 1800, 2400, 3200, 4300, 5700, 7600, 10100, 13300, 17500, 23000, 30200, 39600, 51900}; - static int[] skins = new int[]{0, 1, 6, 7}; + static final int[] skins = new int[]{0, 1, 6, 7}; public final THashMap petActions = new THashMap<>() { { this.put(0, new ActionFree()); diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java index 909dec72..f52e7771 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -100,7 +100,7 @@ public class Room implements Comparable, ISerialize, Runnable { public static String PREFIX_FORMAT = "[%prefix%] "; public static int ROLLERS_MAXIMUM_ROLL_AVATARS = 1; public static boolean MUTEAREA_CAN_WHISPER = false; - public static double MAXIMUM_FURNI_HEIGHT = 40d; + public static final double MAXIMUM_FURNI_HEIGHT = 40d; static { for (int i = 1; i <= 3; i++) { @@ -141,7 +141,7 @@ public class Room implements Comparable, ISerialize, Runnable { //Use appropriately. Could potentially cause memory leaks when used incorrectly. public volatile boolean preventUnloading = false; public volatile boolean preventUncaching = false; - public ConcurrentSet scheduledComposers = new ConcurrentSet<>(); + public final ConcurrentSet scheduledComposers = new ConcurrentSet<>(); public ConcurrentSet scheduledTasks = new ConcurrentSet<>(); public String wordQuiz = ""; public int noVotes = 0; @@ -2872,7 +2872,7 @@ public class Room implements Comparable, ISerialize, Runnable { Emulator.getPluginManager().fireEvent(event); if (!event.isCancelled()) { - if (!event.idle) { + if (!event.isIdle()) { this.unIdle(habbo); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java index 2f49d04f..2f2b5fdb 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java @@ -32,7 +32,7 @@ public class RoomLayout { private RoomTile doorTile; private final Room room; - public RoomLayout(ResultSet set, Room room) throws SQLException { + public RoomLayout(ResultSet set, Room room) { this.room = room; try { this.name = set.getString("name"); diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java index fcb9fbdf..a3f661c4 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java @@ -723,8 +723,8 @@ public class RoomManager { if (Emulator.getPluginManager().isRegistered(HabboAddedToRoomEvent.class, false)) { HabboAddedToRoomEvent event = Emulator.getPluginManager().fireEvent(new HabboAddedToRoomEvent(habbo, room, habbosToSendEnter, visibleHabbos)); - habbosToSendEnter = event.habbosToSendEnter; - visibleHabbos = event.visibleHabbos; + habbosToSendEnter = event.getHabbosToSendEnter(); + visibleHabbos = event.getVisibleHabbos(); } for (Habbo habboToSendEnter : habbosToSendEnter) { diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java index 6cf0b69a..7e20e953 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomUnit.java @@ -225,7 +225,7 @@ public class RoomUnit { Emulator.getPluginManager().fireEvent(event); if (!event.isCancelled()) { - if (!event.idle) { + if (!event.isIdle()) { room.unIdle(habbo); this.idleTimer = 0; } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java index 47e1811f..cfdb7a3e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -206,7 +206,7 @@ public class Habbo implements Runnable { if (Emulator.getPluginManager().fireEvent(event).isCancelled()) return; - this.getHabboInfo().addCredits(event.credits); + this.getHabboInfo().addCredits(event.getCredits()); if (this.client != null) this.client.sendResponse(new CreditBalanceComposer(this.client.getHabbo())); } @@ -221,7 +221,7 @@ public class Habbo implements Runnable { if (Emulator.getPluginManager().fireEvent(event).isCancelled()) return; - this.getHabboInfo().addPixels(event.points); + this.getHabboInfo().addPixels(event.getPoints()); if (this.client != null) this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); } @@ -239,9 +239,9 @@ public class Habbo implements Runnable { if (Emulator.getPluginManager().fireEvent(event).isCancelled()) return; - this.getHabboInfo().addCurrencyAmount(event.type, event.points); + this.getHabboInfo().addCurrencyAmount(event.getType(), event.getPoints()); if (this.client != null) - this.client.sendResponse(new HabboActivityPointNotificationMessageComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(type), event.points, event.type)); + this.client.sendResponse(new HabboActivityPointNotificationMessageComposer(this.client.getHabbo().getHabboInfo().getCurrencyAmount(type), event.getPoints(), event.getType())); } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java index 3cc136b5..2614bf47 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java @@ -113,7 +113,6 @@ public class HabboManager { userId = s.getInt("id"); } } - statement.close(); } catch (SQLException e) { log.error("Caught SQL exception", e); } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/ClothingValidationManager.java b/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/ClothingValidationManager.java index 7a7fcb4c..2c2a56d3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/ClothingValidationManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/ClothingValidationManager.java @@ -90,7 +90,7 @@ public class ClothingValidationManager { * @return Cleaned figure string */ public static String validateLook(String look, String gender, boolean isHC, TIntCollection ownedClothing) { - if(FIGUREDATA.palettes.size() == 0 || FIGUREDATA.settypes.size() == 0) + if(FIGUREDATA.getPalettes().size() == 0 || FIGUREDATA.getSettypes().size() == 0) return look; String[] newLookParts = look.split(Pattern.quote(".")); @@ -102,14 +102,14 @@ public class ClothingValidationManager { for(String lookpart : newLookParts) { if (lookpart.contains("-")) { String[] data = lookpart.split(Pattern.quote("-")); - FiguredataSettype settype = FIGUREDATA.settypes.get(data[0]); + FiguredataSettype settype = FIGUREDATA.getSettypes().get(data[0]); if(settype != null) { parts.put(data[0], data); } } } - FIGUREDATA.settypes.entrySet().stream().filter(x -> !parts.containsKey(x.getKey())).forEach(x -> + FIGUREDATA.getSettypes().entrySet().stream().filter(x -> !parts.containsKey(x.getKey())).forEach(x -> { FiguredataSettype settype = x.getValue(); @@ -132,13 +132,13 @@ public class ClothingValidationManager { parts.forEach((key, data) -> { try { if (data.length >= 1) { - FiguredataSettype settype = FIGUREDATA.settypes.get(data[0]); + FiguredataSettype settype = FIGUREDATA.getSettypes().get(data[0]); if (settype == null) { //throw new Exception("Set type " + data[0] + " does not exist"); return; } - FiguredataPalette palette = FIGUREDATA.palettes.get(settype.getPaletteId()); + FiguredataPalette palette = FIGUREDATA.getPalettes().get(settype.getPaletteId()); if (palette == null) { throw new Exception("Palette " + settype.getPaletteId() + " does not exist"); } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/Figuredata.java b/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/Figuredata.java index 23936acc..21b45e32 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/Figuredata.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/clothingvalidation/Figuredata.java @@ -1,5 +1,6 @@ package com.eu.habbo.habbohotel.users.clothingvalidation; +import lombok.Getter; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -18,9 +19,10 @@ import java.io.StringWriter; import java.util.Map; import java.util.TreeMap; +@Getter public class Figuredata { - public Map palettes; - public Map settypes; + private final Map palettes; + private final Map settypes; public Figuredata() { palettes = new TreeMap<>(); diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/ItemsComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/ItemsComponent.java index ee851a8c..f9597b16 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/ItemsComponent.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/ItemsComponent.java @@ -75,7 +75,7 @@ public class ItemsComponent { } synchronized (this.items) { - this.items.put(event.item.getId(), event.item); + this.items.put(event.getItem().getId(), event.getItem()); } } @@ -127,7 +127,7 @@ public class ItemsComponent { } synchronized (this.items) { - this.items.remove(event.item.getId()); + this.items.remove(event.getItem().getId()); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java b/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java index 968ed7f1..18017ba9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionHabboClub.java @@ -36,7 +36,7 @@ public class SubscriptionHabboClub extends Subscription { public static int HC_PAYDAY_NEXT_DATE = Integer.MAX_VALUE; // yyyy-MM-dd HH:mm:ss public static String HC_PAYDAY_INTERVAL = ""; public static String HC_PAYDAY_QUERY = ""; - public static TreeMap HC_PAYDAY_STREAK = new TreeMap<>(); + public static final TreeMap HC_PAYDAY_STREAK = new TreeMap<>(); public static String HC_PAYDAY_CURRENCY = ""; public static Double HC_PAYDAY_KICKBACK_PERCENTAGE = 0.1; public static String ACHIEVEMENT_NAME = ""; diff --git a/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionManager.java b/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionManager.java index e688e839..16814a09 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/subscriptions/SubscriptionManager.java @@ -20,7 +20,7 @@ import java.sql.SQLException; @Getter public class SubscriptionManager { - private THashMap> types; + private final THashMap> types; public SubscriptionManager() { this.types = new THashMap<>(); diff --git a/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java b/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java index e60a2085..a05f7975 100644 --- a/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java +++ b/src/main/java/com/eu/habbo/habbohotel/wired/WiredHandler.java @@ -26,7 +26,7 @@ import com.eu.habbo.messages.outgoing.wired.WiredRewardResultMessageComposer; import com.eu.habbo.plugin.events.furniture.wired.WiredConditionFailedEvent; import com.eu.habbo.plugin.events.furniture.wired.WiredStackExecutedEvent; import com.eu.habbo.plugin.events.furniture.wired.WiredStackTriggeredEvent; -import com.eu.habbo.plugin.events.users.UserWiredRewardReceived; +import com.eu.habbo.plugin.events.users.UserWiredRewardReceivedEvent; import com.google.gson.GsonBuilder; import gnu.trove.set.hash.THashSet; import lombok.extern.slf4j.Slf4j; @@ -285,8 +285,8 @@ public class WiredHandler { } private static void giveReward(Habbo habbo, WiredEffectGiveReward wiredBox, WiredGiveRewardItem reward) { - if (wiredBox.limit > 0) - wiredBox.given++; + if (wiredBox.getLimit() > 0) + wiredBox.incrementGiven(); try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO wired_rewards_given (wired_item, user_id, reward_id, timestamp) VALUES ( ?, ?, ?, ?)")) { statement.setInt(1, wiredBox.getId()); @@ -299,17 +299,17 @@ public class WiredHandler { } if (reward.isBadge()) { - UserWiredRewardReceived rewardReceived = new UserWiredRewardReceived(habbo, wiredBox, "badge", reward.getData()); + UserWiredRewardReceivedEvent rewardReceived = new UserWiredRewardReceivedEvent(habbo, wiredBox, "badge", reward.getData()); if (Emulator.getPluginManager().fireEvent(rewardReceived).isCancelled()) return; - if (rewardReceived.value.isEmpty()) + if (rewardReceived.getValue().isEmpty()) return; - if (habbo.getInventory().getBadgesComponent().hasBadge(rewardReceived.value)) + if (habbo.getInventory().getBadgesComponent().hasBadge(rewardReceived.getValue())) return; - HabboBadge badge = new HabboBadge(0, rewardReceived.value, 0, habbo); + HabboBadge badge = new HabboBadge(0, rewardReceived.getValue(), 0, habbo); Emulator.getThreading().run(badge); habbo.getInventory().getBadgesComponent().addBadge(badge); habbo.getClient().sendResponse(new BadgeReceivedComposer(badge)); @@ -318,31 +318,31 @@ public class WiredHandler { String[] data = reward.getData().split("#"); if (data.length == 2) { - UserWiredRewardReceived rewardReceived = new UserWiredRewardReceived(habbo, wiredBox, data[0], data[1]); + UserWiredRewardReceivedEvent rewardReceived = new UserWiredRewardReceivedEvent(habbo, wiredBox, data[0], data[1]); if (Emulator.getPluginManager().fireEvent(rewardReceived).isCancelled()) return; - if (rewardReceived.value.isEmpty()) + if (rewardReceived.getValue().isEmpty()) return; - if (rewardReceived.type.equalsIgnoreCase("credits")) { - int credits = Integer.parseInt(rewardReceived.value); + if (rewardReceived.getType().equalsIgnoreCase("credits")) { + int credits = Integer.parseInt(rewardReceived.getValue()); habbo.giveCredits(credits); - } else if (rewardReceived.type.equalsIgnoreCase("pixels")) { - int pixels = Integer.parseInt(rewardReceived.value); + } else if (rewardReceived.getType().equalsIgnoreCase("pixels")) { + int pixels = Integer.parseInt(rewardReceived.getValue()); habbo.givePixels(pixels); - } else if (rewardReceived.type.startsWith("points")) { - int points = Integer.parseInt(rewardReceived.value); + } else if (rewardReceived.getType().startsWith("points")) { + int points = Integer.parseInt(rewardReceived.getValue()); int type = 5; try { - type = Integer.parseInt(rewardReceived.type.replace("points", "")); + type = Integer.parseInt(rewardReceived.getType().replace("points", "")); } catch (Exception ignored) { } habbo.givePoints(type, points); - } else if (rewardReceived.type.equalsIgnoreCase("furni")) { - Item baseItem = Emulator.getGameEnvironment().getItemManager().getItem(Integer.parseInt(rewardReceived.value)); + } else if (rewardReceived.getType().equalsIgnoreCase("furni")) { + Item baseItem = Emulator.getGameEnvironment().getItemManager().getItem(Integer.parseInt(rewardReceived.getValue())); if (baseItem != null) { HabboItem item = Emulator.getGameEnvironment().getItemManager().createItem(habbo.getHabboInfo().getId(), baseItem, 0, 0, ""); @@ -354,10 +354,10 @@ public class WiredHandler { habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_RECEIVED_ITEM)); } } - } else if (rewardReceived.type.equalsIgnoreCase("respect")) { - habbo.getHabboStats().increaseRespectPointsReceived(Integer.parseInt(rewardReceived.value)); - } else if (rewardReceived.type.equalsIgnoreCase("cata")) { - CatalogItem item = Emulator.getGameEnvironment().getCatalogManager().getCatalogItem(Integer.parseInt(rewardReceived.value)); + } else if (rewardReceived.getType().equalsIgnoreCase("respect")) { + habbo.getHabboStats().increaseRespectPointsReceived(Integer.parseInt(rewardReceived.getValue())); + } else if (rewardReceived.getType().equalsIgnoreCase("cata")) { + CatalogItem item = Emulator.getGameEnvironment().getCatalogManager().getCatalogItem(Integer.parseInt(rewardReceived.getValue())); if (item != null) { Emulator.getGameEnvironment().getCatalogManager().purchaseItem(null, item, habbo, 1, "", true); @@ -369,8 +369,8 @@ public class WiredHandler { } public static boolean getReward(Habbo habbo, WiredEffectGiveReward wiredBox) { - if (wiredBox.limit > 0) { - if (wiredBox.limit - wiredBox.given == 0) { + if (wiredBox.getLimit() > 0) { + if (wiredBox.getLimit() - wiredBox.getGiven() == 0) { habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.LIMITED_NO_MORE_AVAILABLE)); return false; } @@ -379,12 +379,12 @@ public class WiredHandler { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("SELECT COUNT(*) as row_count, wired_rewards_given.* FROM wired_rewards_given WHERE user_id = ? AND wired_item = ? ORDER BY timestamp DESC LIMIT ?", ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY)) { statement.setInt(1, habbo.getHabboInfo().getId()); statement.setInt(2, wiredBox.getId()); - statement.setInt(3, wiredBox.rewardItems.size()); + statement.setInt(3, wiredBox.getRewardItems().size()); try (ResultSet set = statement.executeQuery()) { if (set.first()) { if (set.getInt("row_count") >= 1) { - if (wiredBox.rewardTime == WiredEffectGiveReward.LIMIT_ONCE) { + if (wiredBox.getRewardTime() == WiredEffectGiveReward.LIMIT_ONCE) { habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALREADY_RECEIVED)); return false; } @@ -392,37 +392,37 @@ public class WiredHandler { set.beforeFirst(); if (set.next()) { - if (wiredBox.rewardTime == WiredEffectGiveReward.LIMIT_N_MINUTES) { + if (wiredBox.getRewardTime() == WiredEffectGiveReward.LIMIT_N_MINUTES) { if (Emulator.getIntUnixTimestamp() - set.getInt("timestamp") <= 60) { habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALREADY_RECEIVED_THIS_MINUTE)); return false; } } - if (wiredBox.uniqueRewards) { - if (set.getInt("row_count") == wiredBox.rewardItems.size()) { + if (wiredBox.isUniqueRewards()) { + if (set.getInt("row_count") == wiredBox.getRewardItems().size()) { habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALL_COLLECTED)); return false; } } - if (wiredBox.rewardTime == WiredEffectGiveReward.LIMIT_N_HOURS) { - if (!(Emulator.getIntUnixTimestamp() - set.getInt("timestamp") >= (3600 * wiredBox.limitationInterval))) { + if (wiredBox.getRewardTime() == WiredEffectGiveReward.LIMIT_N_HOURS) { + if (!(Emulator.getIntUnixTimestamp() - set.getInt("timestamp") >= (3600 * wiredBox.getLimitationInterval()))) { habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALREADY_RECEIVED_THIS_HOUR)); return false; } } - if (wiredBox.rewardTime == WiredEffectGiveReward.LIMIT_N_DAY) { - if (!(Emulator.getIntUnixTimestamp() - set.getInt("timestamp") >= (86400 * wiredBox.limitationInterval))) { + if (wiredBox.getRewardTime() == WiredEffectGiveReward.LIMIT_N_DAY) { + if (!(Emulator.getIntUnixTimestamp() - set.getInt("timestamp") >= (86400 * wiredBox.getLimitationInterval()))) { habbo.getClient().sendResponse(new WiredRewardResultMessageComposer(WiredRewardResultMessageComposer.REWARD_ALREADY_RECEIVED_THIS_TODAY)); return false; } } } - if (wiredBox.uniqueRewards) { - for (WiredGiveRewardItem item : wiredBox.rewardItems) { + if (wiredBox.isUniqueRewards()) { + for (WiredGiveRewardItem item : wiredBox.getRewardItems()) { set.beforeFirst(); boolean found = false; @@ -440,7 +440,7 @@ public class WiredHandler { int randomNumber = Emulator.getRandom().nextInt(101); int count = 0; - for (WiredGiveRewardItem item : wiredBox.rewardItems) { + for (WiredGiveRewardItem item : wiredBox.getRewardItems()) { if (randomNumber >= count && randomNumber <= (count + item.getProbability())) { giveReward(habbo, wiredBox, item); return true; diff --git a/src/main/java/com/eu/habbo/messages/incoming/MessageHandler.java b/src/main/java/com/eu/habbo/messages/incoming/MessageHandler.java index 38920afe..9364993e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/MessageHandler.java +++ b/src/main/java/com/eu/habbo/messages/incoming/MessageHandler.java @@ -6,6 +6,8 @@ import com.eu.habbo.messages.ClientMessage; public abstract class MessageHandler { public GameClient client; public ClientMessage packet; + + @SuppressWarnings("CanBeFinal") public boolean isCancelled = false; public abstract void handle() throws Exception; diff --git a/src/main/java/com/eu/habbo/messages/incoming/achievements/GetAchievementsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/achievements/GetAchievementsEvent.java index 23ce046d..48c42a9e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/achievements/GetAchievementsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/achievements/GetAchievementsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.achievements.AchievementsComposer; public class GetAchievementsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new AchievementsComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementConfigurationEvent.java b/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementConfigurationEvent.java index 07d329ee..4eccf282 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementConfigurationEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementConfigurationEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.inventory.BadgePointLimitsComposer; public class RequestAchievementConfigurationEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new BadgePointLimitsComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertEvent.java b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertEvent.java index 0a007a36..d86c44c6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/AmbassadorAlertEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.plugin.events.support.SupportUserAlertedReason; public class AmbassadorAlertEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (!this.client.getHabbo().hasPermission(Permission.ACC_AMBASSADOR)) { ScripterManager.scripterDetected(this.client, Emulator.getTexts().getValue("scripter.warning.modtools.alert").replace("%username%", client.getHabbo().getHabboInfo().getUsername()).replace("%message%", "${notification.ambassador.alert.warning.message}")); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/FollowFriendEvent.java b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/FollowFriendEvent.java index e550d1ef..0d73a799 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/ambassadors/FollowFriendEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/ambassadors/FollowFriendEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.rooms.RoomForwardMessageComposer; public class FollowFriendEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_AMBASSADOR)) { String username = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/PublishPhotoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/PublishPhotoEvent.java index 0412a8cd..d45dacbd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/PublishPhotoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/PublishPhotoEvent.java @@ -19,7 +19,7 @@ public class PublishPhotoEvent extends MessageHandler { public static int CAMERA_PUBLISH_POINTS_TYPE = 0; @Override - public void handle() throws Exception { + public void handle() { Habbo habbo = this.client.getHabbo(); if (habbo == null) return; @@ -43,9 +43,9 @@ public class PublishPhotoEvent extends MessageHandler { if (!Emulator.getPluginManager().fireEvent(publishPictureEvent).isCancelled()) { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO camera_web (user_id, room_id, timestamp, url) VALUES (?, ?, ?, ?)")) { statement.setInt(1, this.client.getHabbo().getHabboInfo().getId()); - statement.setInt(2, publishPictureEvent.roomId); - statement.setInt(3, publishPictureEvent.timestamp); - statement.setString(4, publishPictureEvent.URL); + statement.setInt(2, publishPictureEvent.getRoomId()); + statement.setInt(3, publishPictureEvent.getTimestamp()); + statement.setString(4, publishPictureEvent.getURL()); statement.execute(); this.client.getHabbo().getHabboInfo().setWebPublishTimestamp(timestamp); diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/PurchasePhotoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/PurchasePhotoEvent.java index b16eebda..a0de9495 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/PurchasePhotoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/PurchasePhotoEvent.java @@ -16,7 +16,7 @@ public class PurchasePhotoEvent extends MessageHandler { public static int CAMERA_PURCHASE_POINTS_TYPE = 0; @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCredits() < PurchasePhotoEvent.CAMERA_PURCHASE_CREDITS) { this.client.sendResponse(new NotEnoughBalanceMessageComposer(true, false, 0)); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomEvent.java index 28b4831f..ab8c181b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.util.crypto.ZIP; public class RenderRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (!this.client.getHabbo().hasPermission("acc_camera")) { this.client.getHabbo().alert(Emulator.getTexts().getValue("camera.permission")); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomThumbnailEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomThumbnailEvent.java index 04f5f032..aae3db4c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomThumbnailEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/RenderRoomThumbnailEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.util.crypto.ZIP; public class RenderRoomThumbnailEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (!this.client.getHabbo().hasPermission("acc_camera")) { this.client.getHabbo().alert(Emulator.getTexts().getValue("camera.permission")); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/camera/RequestCameraConfigurationEvent.java b/src/main/java/com/eu/habbo/messages/incoming/camera/RequestCameraConfigurationEvent.java index cc90af9e..fe7450f7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/camera/RequestCameraConfigurationEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/camera/RequestCameraConfigurationEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.camera.CameraPriceComposer; public class RequestCameraConfigurationEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new CameraPriceComposer(Emulator.getConfig().getInt("camera.price.credits"), Emulator.getConfig().getInt("camera.price.points"), Emulator.getConfig().getInt("camera.price.points.publish"))); } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java index 03e4dc47..9d727125 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class OpenCampaignCalendarDoorAsStaffEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String campaignName = this.packet.readString(); int day = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java index cb66ae3b..0f1555e6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class OpenCampaignCalendarDoorEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String campaignName = this.packet.readString(); int day = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/ApproveNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/ApproveNameEvent.java index 00ec28b3..d7df63e8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/ApproveNameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/ApproveNameEvent.java @@ -10,7 +10,7 @@ public class ApproveNameEvent extends MessageHandler { public static int PET_NAME_LENGTH_MAXIMUM = Emulator.getConfig().getInt("hotel.pets.name.length.max"); @Override - public void handle() throws Exception { + public void handle() { String petName = this.packet.readString(); if (petName.length() < PET_NAME_LENGTH_MINIMUM) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubPlaceWallItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubPlaceWallItemEvent.java index ebbf4ecc..fa13813c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubPlaceWallItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubPlaceWallItemEvent.java @@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory; public class BuildersClubPlaceWallItemEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Subscription subscription = this.client.getHabbo().getHabboStats().getSubscription(SubscriptionHabboClub.HABBO_CLUB); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubQueryFurniCountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubQueryFurniCountEvent.java index 6aa495dc..4fa92f92 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubQueryFurniCountEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/BuildersClubQueryFurniCountEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class BuildersClubQueryFurniCountEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { //this.client.sendResponse(new CatalogPagesListComposer(this.client.getHabbo(), "NORMAL")); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetBundleDiscountRulesetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetBundleDiscountRulesetEvent.java index 1686f96d..ada79f53 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetBundleDiscountRulesetEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetBundleDiscountRulesetEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.catalog.BundleDiscountRulesetMessageCompos public class GetBundleDiscountRulesetEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new BundleDiscountRulesetMessageComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogIndexEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogIndexEvent.java index fdee81e7..8b8b7054 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogIndexEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogIndexEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.catalog.CatalogPagesListComposer; public class GetCatalogIndexEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String MODE = this.packet.readString(); if (MODE.equalsIgnoreCase("normal")) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogPageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogPageEvent.java index 3bf2f430..0eb12453 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogPageEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetCatalogPageEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.catalog.CatalogPageMessageComposer; public class GetCatalogPageEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int catalogPageId = this.packet.readInt(); int offerId = this.packet.readInt(); String mode = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubGiftInfo.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubGiftInfo.java index 3cdc1aed..2a3ae6fb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubGiftInfo.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubGiftInfo.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.catalog.ClubGiftInfoComposer; public class GetClubGiftInfo extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new ClubGiftInfoComposer( (int) Math.floor(this.client.getHabbo().getHabboStats().getTimeTillNextClubGift() / 86400.0), this.client.getHabbo().getHabboStats().getRemainingClubGifts(), diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubOffersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubOffersEvent.java index 915b9d6a..9caf3540 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubOffersEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetClubOffersEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.catalog.HabboClubOffersMessageComposer; public class GetClubOffersEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new HabboClubOffersMessageComposer(this.client.getHabbo(), this.packet.readInt())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetGiftWrappingConfigurationEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetGiftWrappingConfigurationEvent.java index cf526dee..a9ac3ded 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetGiftWrappingConfigurationEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetGiftWrappingConfigurationEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.catalog.GiftWrappingConfigurationComposer; public class GetGiftWrappingConfigurationEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GiftWrappingConfigurationComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetMarketplaceConfigurationEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetMarketplaceConfigurationEvent.java index 121ffda3..13384f2f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetMarketplaceConfigurationEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetMarketplaceConfigurationEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceConfigurati public class GetMarketplaceConfigurationEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new MarketplaceConfigurationComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetOfficialSongIdEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetOfficialSongIdEvent.java index 14be0679..cbaf52a9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetOfficialSongIdEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetOfficialSongIdEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.jukebox.OfficialSongIdMessageC public class GetOfficialSongIdEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String songName = this.packet.readString(); final SoundTrack track = Emulator.getGameEnvironment().getItemManager().getSoundTrack(songName); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetProductOfferEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetProductOfferEvent.java index 67c303f6..810b5d95 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetProductOfferEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetProductOfferEvent.java @@ -9,7 +9,7 @@ import gnu.trove.iterator.TIntObjectIterator; public class GetProductOfferEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int offerId = this.packet.readInt(); int pageId = Emulator.getGameEnvironment().getCatalogManager().offerDefs.get(offerId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSellablePetPalettesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSellablePetPalettesEvent.java index 751f6451..386284d9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSellablePetPalettesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSellablePetPalettesEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.catalog.SellablePetPalettesMessageComposer public class GetSellablePetPalettesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String petName = this.packet.readString(); this.client.sendResponse(new SellablePetPalettesMessageComposer(petName, Emulator.getGameEnvironment().getPetManager().getBreeds(petName))); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSongInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSongInfoEvent.java index 46228451..893dfad5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSongInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/GetSongInfoEvent.java @@ -10,7 +10,7 @@ import java.util.List; public class GetSongInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int count = this.packet.readInt(); List tracks = new ArrayList<>(count); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogAsGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogAsGiftEvent.java index 982df6cf..080b2958 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogAsGiftEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseFromCatalogAsGiftEvent.java @@ -37,7 +37,7 @@ import java.util.Calendar; @Slf4j public class PurchaseFromCatalogAsGiftEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (Emulator.getIntUnixTimestamp() - this.client.getHabbo().getHabboStats().getLastGiftTimestamp() >= CatalogManager.PURCHASE_COOLDOWN) { this.client.getHabbo().getHabboStats().setLastGiftTimestamp(Emulator.getIntUnixTimestamp()); if (ShutdownEmulator.timestamp > 0) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetedOfferEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetedOfferEvent.java index 9038fc36..adb1da7b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetedOfferEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/PurchaseTargetedOfferEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class PurchaseTargetedOfferEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int offerId = this.packet.readInt(); int amount = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/RedeemVoucherEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/RedeemVoucherEvent.java index 732289f7..5fbf818d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/RedeemVoucherEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/RedeemVoucherEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.threading.runnables.ShutdownEmulator; public class RedeemVoucherEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (ShutdownEmulator.timestamp > 0) { this.client.sendResponse(new HotelWillCloseInMinutesComposer((ShutdownEmulator.timestamp - Emulator.getIntUnixTimestamp()) / 60)); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/SelectClubGiftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/SelectClubGiftEvent.java index 555f8e7a..cfb6ac6e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/SelectClubGiftEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/SelectClubGiftEvent.java @@ -15,7 +15,7 @@ import lombok.extern.slf4j.Slf4j; public class SelectClubGiftEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String itemName = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/SetTargetedOfferStateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/SetTargetedOfferStateEvent.java index 6154d478..0c68565b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/SetTargetedOfferStateEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/SetTargetedOfferStateEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class SetTargetedOfferStateEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int id = this.packet.readInt(); int state = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyMarketplaceOfferEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyMarketplaceOfferEvent.java index 2f801978..cc944937 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyMarketplaceOfferEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/BuyMarketplaceOfferEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class BuyMarketplaceOfferEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int offerId = this.packet.readInt(); MarketPlace.buyItem(offerId, this.client); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/CancelMarketplaceOfferEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/CancelMarketplaceOfferEvent.java index fb40f258..63afa05d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/CancelMarketplaceOfferEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/CancelMarketplaceOfferEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class CancelMarketplaceOfferEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int offerId = this.packet.readInt(); MarketPlace.takeBackItem(this.client.getHabbo(), offerId); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceCanMakeOfferEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceCanMakeOfferEvent.java index 93c043c4..21a7b225 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceCanMakeOfferEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceCanMakeOfferEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceCanMakeOffe public class GetMarketplaceCanMakeOfferEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (MarketPlace.MARKETPLACE_ENABLED) this.client.sendResponse(new MarketplaceCanMakeOfferResult(1, 0, 0)); else diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceItemStatsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceItemStatsEvent.java index 208fa341..e1dc5159 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceItemStatsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceItemStatsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketplaceItemStatsCo public class GetMarketplaceItemStatsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.packet.readInt(); int id = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOffersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOffersEvent.java index c20a7a74..0ab58c9e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOffersEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOffersEvent.java @@ -14,7 +14,7 @@ public class GetMarketplaceOffersEvent extends MessageHandler { public final static Map cachedResults = new ConcurrentHashMap<>(0); @Override - public void handle() throws Exception { + public void handle() { int min = this.packet.readInt(); int max = this.packet.readInt(); String query = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOwnOffersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOwnOffersEvent.java index b74c125f..5cf7f675 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOwnOffersEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/GetMarketplaceOwnOffersEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.catalog.marketplace.MarketPlaceOwnOffersCo public class GetMarketplaceOwnOffersEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new MarketPlaceOwnOffersComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/MakeOfferEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/MakeOfferEvent.java index a7cca996..56495b1a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/MakeOfferEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/MakeOfferEvent.java @@ -13,7 +13,7 @@ import lombok.extern.slf4j.Slf4j; public class MakeOfferEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (!MarketPlace.MARKETPLACE_ENABLED) { this.client.sendResponse(new MarketplaceMakeOfferResult(MarketplaceMakeOfferResult.MARKETPLACE_DISABLED)); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RedeemMarketplaceOfferCreditsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RedeemMarketplaceOfferCreditsEvent.java index 27e99514..e1c78a44 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RedeemMarketplaceOfferCreditsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/marketplace/RedeemMarketplaceOfferCreditsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RedeemMarketplaceOfferCreditsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { MarketPlace.getCredits(this.client); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerPrizesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerPrizesEvent.java index 8942709f..85c85efa 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerPrizesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerPrizesEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.catalog.RecyclerPrizesComposer; public class GetRecyclerPrizesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new RecyclerPrizesComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerStatusEvent.java index 3304e795..c7a73cda 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerStatusEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/GetRecyclerStatusEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.catalog.RecyclerStatusComposer; public class GetRecyclerStatusEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new RecyclerStatusComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/PresentOpenEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/PresentOpenEvent.java index 4e416596..d834243c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/PresentOpenEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/PresentOpenEvent.java @@ -16,7 +16,7 @@ import com.eu.habbo.threading.runnables.OpenGift; public class PresentOpenEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleItemsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleItemsEvent.java index 2524ba0b..99796945 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleItemsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/recycler/RecycleItemsEvent.java @@ -17,7 +17,7 @@ import gnu.trove.set.hash.THashSet; public class RecycleItemsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (ShutdownEmulator.timestamp > 0) { this.client.sendResponse(new HotelWillCloseInMinutesComposer((ShutdownEmulator.timestamp - Emulator.getIntUnixTimestamp()) / 60)); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftEvent.java index 4c0f1a8e..152f88ca 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftEvent.java @@ -19,7 +19,7 @@ import java.util.Map; public class CraftEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int craftingTable = this.packet.readInt(); HabboItem item = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabboItem(craftingTable); CraftingAltar altar = Emulator.getGameEnvironment().getCraftingManager().getAltar(item.getBaseItem()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftSecretEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftSecretEvent.java index 4cafc26a..68ac6b93 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftSecretEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/CraftSecretEvent.java @@ -21,7 +21,7 @@ import java.util.Set; public class CraftSecretEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int altarId = this.packet.readInt(); int count = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftableProductsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftableProductsEvent.java index dac5503f..7a5e877a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftableProductsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftableProductsEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.crafting.CraftingRecipeComposer; public class GetCraftableProductsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String recipeName = this.packet.readString(); CraftingRecipe recipe = Emulator.getGameEnvironment().getCraftingManager().getRecipe(recipeName); diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipeEvent.java index f2a3a7ae..8f7e5f0a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipeEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.crafting.CraftableProductsComposer; public class GetCraftingRecipeEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); HabboItem item = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabboItem(itemId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipesAvailableEvent.java b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipesAvailableEvent.java index 3568afab..d2ce560b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipesAvailableEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/crafting/GetCraftingRecipesAvailableEvent.java @@ -13,7 +13,7 @@ import java.util.Map; public class GetCraftingRecipesAvailableEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int altarId = this.packet.readInt(); HabboItem item = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabboItem(altarId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetOccupiedTilesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetOccupiedTilesEvent.java index 008e3a9d..4bc3e64a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetOccupiedTilesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetOccupiedTilesEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.floorplaneditor.RoomOccupiedTilesMessageCo public class GetOccupiedTilesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetRoomEntryTileEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetRoomEntryTileEvent.java index e04ae037..4d5c3f53 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetRoomEntryTileEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/GetRoomEntryTileEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.rooms.RoomFloorThicknessUpdatedComposer; public class GetRoomEntryTileEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/UpdateFloorPropertiesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/UpdateFloorPropertiesEvent.java index 42ba1143..ac1cbec8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/UpdateFloorPropertiesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/UpdateFloorPropertiesEvent.java @@ -22,7 +22,7 @@ public class UpdateFloorPropertiesEvent extends MessageHandler { public static int MAXIMUM_FLOORPLAN_SIZE = 64 * 64; @Override - public void handle() throws Exception { + public void handle() { if (!this.client.getHabbo().hasPermission(Permission.ACC_FLOORPLAN_EDITOR)) { this.client.sendResponse(new HabboBroadcastMessageComposer(Emulator.getTexts().getValue("floorplan.permission"))); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendEvent.java index 6ce732b1..ed63d16c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/AcceptFriendEvent.java @@ -19,7 +19,7 @@ import static com.eu.habbo.habbohotel.users.HabboManager.getOfflineHabboInfo; public class AcceptFriendEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int count = this.packet.readInt(); int userId; diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendEvent.java index 14113be2..5277ec72 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/DeclineFriendEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class DeclineFriendEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { boolean all = this.packet.readBoolean(); if (all) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/FindNewFriendsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/FindNewFriendsEvent.java index adbad1d5..82d9cab3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/FindNewFriendsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/FindNewFriendsEvent.java @@ -12,7 +12,7 @@ import java.util.List; public class FindNewFriendsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { List roomCategories = Emulator.getGameEnvironment().getRoomManager().roomCategoriesForHabbo(this.client.getHabbo()); Collections.shuffle(roomCategories); diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/GetFriendRequestsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/GetFriendRequestsEvent.java index 5cec718f..d76f931c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/GetFriendRequestsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/GetFriendRequestsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.friends.FriendRequestsComposer; public class GetFriendRequestsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new FriendRequestsComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/GetMOTDEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/GetMOTDEvent.java index 8e23da8b..bb1c60e2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/GetMOTDEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/GetMOTDEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class GetMOTDEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { //this.client.sendResponse(new FriendsComposer(this.client.getHabbo())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/HabboSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/HabboSearchEvent.java index fe5bad75..77538573 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/HabboSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/HabboSearchEvent.java @@ -9,10 +9,10 @@ import gnu.trove.set.hash.THashSet; import java.util.concurrent.ConcurrentHashMap; public class HabboSearchEvent extends MessageHandler { - public static ConcurrentHashMap> cachedResults = new ConcurrentHashMap<>(); + public static final ConcurrentHashMap> cachedResults = new ConcurrentHashMap<>(); @Override - public void handle() throws Exception { + public void handle() { if (System.currentTimeMillis() - this.client.getHabbo().getHabboStats().getLastUsersSearched() < 3000) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/MessengerInitEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/MessengerInitEvent.java index d07b2972..5605976e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/MessengerInitEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/MessengerInitEvent.java @@ -9,7 +9,7 @@ import java.util.ArrayList; public class MessengerInitEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { ArrayList messages = new ArrayList<>(); messages.add(new MessengerInitComposer(this.client.getHabbo()).compose()); messages.addAll(FriendListFragmentMessageComposer.getMessagesForBuddyList(this.client.getHabbo().getMessenger().getFriends().values())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/RemoveFriendEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/RemoveFriendEvent.java index 27bc05e2..160e9888 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/RemoveFriendEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/RemoveFriendEvent.java @@ -16,7 +16,7 @@ public class RemoveFriendEvent extends MessageHandler { } @Override - public void handle() throws Exception { + public void handle() { int count = this.packet.readInt(); for (int i = 0; i < count; i++) { int habboId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java index ae22d45e..0716d713 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/RequestFriendEvent.java @@ -18,7 +18,7 @@ import java.sql.SQLException; @Slf4j public class RequestFriendEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String username = this.packet.readString(); if (this.client == null || username == null || username.isEmpty()) diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/SendMsgEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/SendMsgEvent.java index 9ea0321f..407475b0 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/SendMsgEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/SendMsgEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.plugin.events.users.friends.UserFriendChatEvent; public class SendMsgEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); String message = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/SendRoomInviteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/SendRoomInviteEvent.java index f4aa8bf8..9868bf21 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/SendRoomInviteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/SendRoomInviteEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.friends.RoomInviteComposer; public class SendRoomInviteEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboStats().allowTalk()) { int[] userIds = new int[this.packet.readInt()]; diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/SetRelationshipStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/SetRelationshipStatusEvent.java index e7f901e9..9792d814 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/SetRelationshipStatusEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/SetRelationshipStatusEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.plugin.events.users.friends.UserRelationShipEvent; public class SetRelationshipStatusEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); int relationId = this.packet.readInt(); @@ -15,7 +15,7 @@ public class SetRelationshipStatusEvent extends MessageHandler { if (buddy != null && relationId >= 0 && relationId <= 3) { UserRelationShipEvent event = new UserRelationShipEvent(this.client.getHabbo(), buddy, relationId); if (!event.isCancelled()) { - buddy.setRelation(event.relationShip); + buddy.setRelation(event.getRelationShip()); this.client.sendResponse(new UpdateFriendComposer(this.client.getHabbo(), buddy, 0)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/friends/VisitUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/friends/VisitUserEvent.java index c7bd9988..e9563b8d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/friends/VisitUserEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/friends/VisitUserEvent.java @@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.WhisperMessageComposer; public class VisitUserEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int friendId = this.packet.readInt(); MessengerBuddy buddy = this.client.getHabbo().getMessenger().getFriend(friendId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/Game2GetAccountGameStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/Game2GetAccountGameStatusEvent.java index 6ca46ce4..0601059d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/Game2GetAccountGameStatusEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/Game2GetAccountGameStatusEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.gamecenter.GameCenterGameComposer; public class Game2GetAccountGameStatusEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GameCenterGameComposer(this.packet.readInt(), GameCenterGameComposer.OK)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameUnloadedEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameUnloadedEvent.java index 683faa9c..87cfe825 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameUnloadedEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GameUnloadedEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.gamecenter.basejump.UnloadGameMessageCompo public class GameUnloadedEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new UnloadGameMessageComposer()); } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameListEvent.java index 5264cdf6..2759d010 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameListEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameListEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.gamecenter.GameCenterAchievementsConfigura public class GetGameListEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GameCenterAchievementsConfigurationComposer()); } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameStatusEvent.java index e42f8305..e5138458 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameStatusEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetGameStatusEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.gamecenter.Game2AccountGameStatusMessageCo public class GetGameStatusEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new Game2AccountGameStatusMessageComposer(this.packet.readInt(), 10)); } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardEvent.java index 4fd651c8..94191898 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardEvent.java @@ -4,6 +4,6 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class GetWeeklyGameRewardEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardWinnersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardWinnersEvent.java index 83bd9c88..4ee23eb0 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardWinnersEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/GetWeeklyGameRewardWinnersEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class GetWeeklyGameRewardWinnersEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int gameId = this.packet.readInt(); if (gameId == 3) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/JoinQueueEvent.java b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/JoinQueueEvent.java index a3657ede..e20c596a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/gamecenter/JoinQueueEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/gamecenter/JoinQueueEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.gamecenter.basejump.LoadGameUrlMessageComp public class JoinQueueEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int gameId = this.packet.readInt(); if (gameId == 3) //BaseJump diff --git a/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDecidesOnOfferEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDecidesOnOfferEvent.java index e1afb371..2acf937b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDecidesOnOfferEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDecidesOnOfferEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ChatReviewGuideDecidesOnOfferEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Emulator.getGameEnvironment().getGuideManager().acceptTicket(this.client.getHabbo(), this.packet.readBoolean()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDetachedEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDetachedEvent.java index 351ebabe..0e127f69 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDetachedEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideDetachedEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ChatReviewGuideDetachedEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { //TODO: Add dont care about ticket updates. } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideVoteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideVoteEvent.java index f186b37f..fb5ddb02 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideVoteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guardians/ChatReviewGuideVoteEvent.java @@ -10,7 +10,7 @@ import lombok.extern.slf4j.Slf4j; public class ChatReviewGuideVoteEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int voteType = this.packet.readInt(); GuardianTicket ticket = Emulator.getGameEnvironment().getGuideManager().getTicketForGuardian(this.client.getHabbo()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionCreateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionCreateEvent.java index 3a215913..3915344c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionCreateEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionCreateEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.guides.GuideSessionErrorMessageComposer; public class GuideSessionCreateEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int type = this.packet.readInt(); String message = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionFeedbackEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionFeedbackEvent.java index 438ce323..40e77def 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionFeedbackEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionFeedbackEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class GuideSessionFeedbackEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { boolean recommend = this.packet.readBoolean(); GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByNoob(this.client.getHabbo()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGetRequesterRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGetRequesterRoomEvent.java index 5f8053be..4302617f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGetRequesterRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGetRequesterRoomEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.guides.GuideSessionRequesterRoomMessageCom public class GuideSessionGetRequesterRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo()); if (tour != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGuideDecidesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGuideDecidesEvent.java index be533774..934c602c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGuideDecidesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionGuideDecidesEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class GuideSessionGuideDecidesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo()); if (tour == null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionInviteRequesterEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionInviteRequesterEvent.java index 33a7df16..350577a9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionInviteRequesterEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionInviteRequesterEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.guides.GuideSessionInvitedToGuideRoomMessa public class GuideSessionInviteRequesterEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHelper(this.client.getHabbo()); if (tour != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionIsTypingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionIsTypingEvent.java index 2383ae8d..66a0a876 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionIsTypingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionIsTypingEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.guides.GuideSessionPartnerIsTypingComposer public class GuideSessionIsTypingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { boolean typing = this.packet.readBoolean(); GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHabbo(this.client.getHabbo()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionMessageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionMessageEvent.java index 47791359..587c0abe 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionMessageEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionMessageEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.guides.GuideSessionMessageMessageComposer; public class GuideSessionMessageEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHabbo(this.client.getHabbo()); if (tour != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionOnDutyUpdateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionOnDutyUpdateEvent.java index 1b93d553..d875b6bc 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionOnDutyUpdateEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionOnDutyUpdateEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.guides.GuideOnDutyStatusMessageComposer; public class GuideSessionOnDutyUpdateEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { boolean onDuty = this.packet.readBoolean(); if (onDuty) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionReportEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionReportEvent.java index b0eca630..b88edd2c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionReportEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionReportEvent.java @@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.modtool.CallForHelpResultMessageComposer; public class GuideSessionReportEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String message = this.packet.readString(); GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHabbo(this.client.getHabbo()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionRequesterCancelsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionRequesterCancelsEvent.java index 42f45fab..7252363f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionRequesterCancelsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionRequesterCancelsEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class GuideSessionRequesterCancelsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByNoob(this.client.getHabbo()); if (tour != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionResolvedEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionResolvedEvent.java index 58df35c5..e0224429 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionResolvedEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guides/GuideSessionResolvedEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class GuideSessionResolvedEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { GuideTour tour = Emulator.getGameEnvironment().getGuideManager().getGuideTourByHabbo(this.client.getHabbo()); if (tour != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/AddAdminRightsToMemberEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/AddAdminRightsToMemberEvent.java index 4df149c4..62832e44 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/AddAdminRightsToMemberEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/AddAdminRightsToMemberEvent.java @@ -12,7 +12,7 @@ import com.eu.habbo.plugin.events.guilds.GuildGivenAdminEvent; public class AddAdminRightsToMemberEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); int userId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java index c3c68791..bec851c2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/ApproveMembershipRequestEvent.java @@ -16,7 +16,7 @@ import com.eu.habbo.plugin.events.guilds.GuildAcceptedMembershipEvent; public class ApproveMembershipRequestEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); int userId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/CreateGuildEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/CreateGuildEvent.java index eb8b2d2b..0727336a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/CreateGuildEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/CreateGuildEvent.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; public class CreateGuildEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String name = this.packet.readString(); String description = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/DeactivateGuildEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/DeactivateGuildEvent.java index 8b88455d..1967de36 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/DeactivateGuildEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/DeactivateGuildEvent.java @@ -14,7 +14,7 @@ import gnu.trove.set.hash.THashSet; public class DeactivateGuildEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/DeselectFavouriteHabboGroupEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/DeselectFavouriteHabboGroupEvent.java index 0fb88538..de87760d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/DeselectFavouriteHabboGroupEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/DeselectFavouriteHabboGroupEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.plugin.events.guilds.GuildRemovedFavoriteEvent; public class DeselectFavouriteHabboGroupEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); if (this.client.getHabbo().getHabboStats().hasGuild(guildId)) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildCreationInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildCreationInfoEvent.java index 16c9210f..94ca7636 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildCreationInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildCreationInfoEvent.java @@ -10,7 +10,7 @@ import java.util.List; public class GetGuildCreationInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { List rooms = Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()); THashSet roomList = new THashSet<>(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditInfoEvent.java index b1168544..2f20419f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditInfoEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.guilds.GuildEditInfoMessageComposer; public class GetGuildEditInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(this.packet.readInt()); this.client.sendResponse(new GuildEditInfoMessageComposer(guild)); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditorDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditorDataEvent.java index 85b54f69..790e8841 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditorDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildEditorDataEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.guilds.GuildEditorDataMessageComposer; public class GetGuildEditorDataEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuildEditorDataMessageComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildFurniContextMenuInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildFurniContextMenuInfoEvent.java index e3596448..7eeb9b4f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildFurniContextMenuInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildFurniContextMenuInfoEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.guilds.GuildFurniContextMenuInfoMessageCom public class GetGuildFurniContextMenuInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); int guildId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembersEvent.java index f15e85cf..03a92203 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembersEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembersEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.guilds.GuildMembersComposer; public class GetGuildMembersEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int groupId = this.packet.readInt(); int pageId = this.packet.readInt(); String query = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembershipsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembershipsEvent.java index 99c2cf5e..a623fda3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembershipsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetGuildMembershipsEvent.java @@ -8,7 +8,7 @@ import gnu.trove.set.hash.THashSet; public class GetGuildMembershipsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { THashSet guilds = new THashSet<>(); for (int i : this.client.getHabbo().getHabboStats().getGuilds()) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupBadgesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupBadgesEvent.java index a4ac9e39..f30ed739 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupBadgesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupBadgesEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class GetHabboGroupBadgesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupDetailsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupDetailsEvent.java index 585eb1e6..c362bc68 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupDetailsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetHabboGroupDetailsEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.guilds.HabboGroupDetailsMessageComposer; public class GetHabboGroupDetailsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); boolean newWindow = this.packet.readBoolean(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java index 7202ada6..b2e20383 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GetMemberGuildItemCountEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.guilds.GuildMemberFurniCountInHQMessageCom public class GetMemberGuildItemCountEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); int userId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/JoinHabboGroupEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/JoinHabboGroupEvent.java index b4e2c3e3..a01526fe 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/JoinHabboGroupEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/JoinHabboGroupEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.guilds.HabboGroupJoinFailedMessageComposer public class JoinHabboGroupEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); if (this.client.getHabbo().getHabboStats().hasGuild(guildId)) diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java index 1a25180b..b769d9b9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/KickMemberEvent.java @@ -15,7 +15,7 @@ import com.eu.habbo.plugin.events.guilds.GuildRemovedMemberEvent; public class KickMemberEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); int userId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java index 595e2617..400c2d81 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RejectMembershipRequestEvent.java @@ -15,7 +15,7 @@ import com.eu.habbo.plugin.events.guilds.GuildDeclinedMembershipEvent; public class RejectMembershipRequestEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); int userId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/RemoveAdminRightsFromMemberEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/RemoveAdminRightsFromMemberEvent.java index 0f205b01..10bad279 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/RemoveAdminRightsFromMemberEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/RemoveAdminRightsFromMemberEvent.java @@ -13,7 +13,7 @@ import com.eu.habbo.plugin.events.guilds.GuildRemovedAdminEvent; public class RemoveAdminRightsFromMemberEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/SelectFavouriteHabboGroupEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/SelectFavouriteHabboGroupEvent.java index 4ab0ed58..6834ebef 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/SelectFavouriteHabboGroupEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/SelectFavouriteHabboGroupEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.plugin.events.guilds.GuildFavoriteSetEvent; public class SelectFavouriteHabboGroupEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildBadgeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildBadgeEvent.java index 92c7bbb2..0a1f0c4e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildBadgeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildBadgeEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.plugin.events.guilds.GuildChangedBadgeEvent; public class UpdateGuildBadgeEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); @@ -51,7 +51,7 @@ public class UpdateGuildBadgeEvent extends MessageHandler { if (badgeEvent.isCancelled()) return; - guild.setBadge(badgeEvent.badge); + guild.setBadge(badgeEvent.getBadge()); guild.needsUpdate = true; if (Emulator.getConfig().getBoolean("imager.internal.enabled")) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildColorsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildColorsEvent.java index 8d5be154..700ec0c3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildColorsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildColorsEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.plugin.events.guilds.GuildChangedColorsEvent; public class UpdateGuildColorsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); @@ -22,9 +22,9 @@ public class UpdateGuildColorsEvent extends MessageHandler { if (colorsEvent.isCancelled()) return; - if (guild.getColorOne() != colorsEvent.colorOne || guild.getColorTwo() != colorsEvent.colorTwo) { - guild.setColorOne(colorsEvent.colorOne); - guild.setColorTwo(colorsEvent.colorTwo); + if (guild.getColorOne() != colorsEvent.getColorOne() || guild.getColorTwo() != colorsEvent.getColorTwo()) { + guild.setColorOne(colorsEvent.getColorOne()); + guild.setColorTwo(colorsEvent.getColorTwo()); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildIdentityEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildIdentityEvent.java index 63f8572f..488b15cc 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildIdentityEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildIdentityEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.plugin.events.guilds.GuildChangedNameEvent; public class UpdateGuildIdentityEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); @@ -22,14 +22,14 @@ public class UpdateGuildIdentityEvent extends MessageHandler { if (nameEvent.isCancelled()) return; - if (guild.getName().equals(nameEvent.name) && guild.getDescription().equals(nameEvent.description)) + if (guild.getName().equals(nameEvent.getName()) && guild.getDescription().equals(nameEvent.getDescription())) return; - if(nameEvent.name.length() > 29 || nameEvent.description.length() > 254) + if(nameEvent.getName().length() > 29 || nameEvent.getDescription().length() > 254) return; - guild.setName(nameEvent.name); - guild.setDescription(nameEvent.description); + guild.setName(nameEvent.getName()); + guild.setDescription(nameEvent.getDescription()); guild.needsUpdate = true; guild.run(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildSettingsEvent.java index a29d3a58..2231b9f1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/UpdateGuildSettingsEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.plugin.events.guilds.GuildChangedSettingsEvent; public class UpdateGuildSettingsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = this.packet.readInt(); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); @@ -23,8 +23,8 @@ public class UpdateGuildSettingsEvent extends MessageHandler { if (settingsEvent.isCancelled()) return; - guild.setState(GuildState.valueOf(settingsEvent.state)); - guild.setRights(settingsEvent.rights); + guild.setState(GuildState.valueOf(settingsEvent.getState())); + guild.setRights(settingsEvent.isRights()); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(guild.getRoomId()); if(room != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumStatsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumStatsEvent.java index 36cf04c0..1cf45a97 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumStatsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumStatsEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.guilds.forums.ForumDataMessageComposer; public class GetForumStatsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = packet.readInt(); Guild guild = Emulator.getGameEnvironment().getGuildManager().getGuild(guildId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumsListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumsListEvent.java index f13eb6be..0f97514a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumsListEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetForumsListEvent.java @@ -18,7 +18,7 @@ import java.util.Set; public class GetForumsListEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int mode = this.packet.readInt(); int offset = this.packet.readInt(); int amount = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetThreadsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetThreadsEvent.java index d7ea6377..5867f7e2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetThreadsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/GetThreadsEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; public class GetThreadsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = packet.readInt(); int index = packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateForumSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateForumSettingsEvent.java index 5aa9bd8a..e9c8b89a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateForumSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/forums/UpdateForumSettingsEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.handshake.ErrorReportComposer; public class UpdateForumSettingsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int guildId = packet.readInt(); int canRead = packet.readInt(); int postMessages = packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/ClientHelloEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/ClientHelloEvent.java index 0f8d6a56..cd82f09a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/ClientHelloEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/ClientHelloEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ClientHelloEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.packet.readString(); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/LatencyPingRequestEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/LatencyPingRequestEvent.java index a5c2ac06..aea5a5db 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/LatencyPingRequestEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/LatencyPingRequestEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.handshake.LatencyPingResponseMessageCompos public class LatencyPingRequestEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new LatencyPingResponseMessageComposer(this.packet.readInt())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/UniqueIDEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/UniqueIDEvent.java index e5fd4524..53dd8dac 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/UniqueIDEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/UniqueIDEvent.java @@ -11,7 +11,7 @@ public class UniqueIDEvent extends MessageHandler { private static final int HASH_LENGTH = 64; @Override - public void handle() throws Exception { + public void handle() { String storedMachineId = this.packet.readString(); String clientFingerprint = this.packet.readString(); String capabilities = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/helper/GetCfhStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/helper/GetCfhStatusEvent.java index 6193d8d6..deb1557a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/helper/GetCfhStatusEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/helper/GetCfhStatusEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.modtool.SanctionStatusComposer; public class GetCfhStatusEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new SanctionStatusComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/helper/GetTalentTrackEvent.java b/src/main/java/com/eu/habbo/messages/incoming/helper/GetTalentTrackEvent.java index b66c4d23..812a4f64 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/helper/GetTalentTrackEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/helper/GetTalentTrackEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.achievements.talenttrack.TalentTrackMessag public class GetTalentTrackEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (Emulator.getConfig().getBoolean("hotel.talenttrack.enabled")) { this.client.sendResponse(new TalentTrackMessageComposer(this.client.getHabbo(), TalentTrackType.valueOf(this.packet.readString().toUpperCase()))); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetBonusRareInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetBonusRareInfoEvent.java index 84eb1e06..e3f327b2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetBonusRareInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetBonusRareInfoEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.hotelview.BonusRareInfoMessageComposer; public class GetBonusRareInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new BonusRareInfoMessageComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetLimitedOfferAppearingNextEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetLimitedOfferAppearingNextEvent.java index 1470df75..2cf174ab 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetLimitedOfferAppearingNextEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetLimitedOfferAppearingNextEvent.java @@ -12,7 +12,7 @@ public class GetLimitedOfferAppearingNextEvent extends MessageHandler { public static String ITEM_NAME; @Override - public void handle() throws Exception { + public void handle() { if (ENABLED) { int timeremaining = Math.max(TIMESTAMP - Emulator.getIntUnixTimestamp(), -1); this.client.sendResponse(new LimitedOfferAppearingNextMessageComposer( diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetPromoArticlesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetPromoArticlesEvent.java index b742633b..48a5f436 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetPromoArticlesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/GetPromoArticlesEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.hotelview.PromoArticlesMessageComposer; public class GetPromoArticlesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new CurrentTimingCodeMessageComposer("2013-05-08 13:0", "gamesmaker")); this.client.sendResponse(new CommunityGoalHallOfFameMessageComposer(Emulator.getGameEnvironment().getHotelViewManager().getHallOfFame())); this.client.sendResponse(new PromoArticlesMessageComposer()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewClaimBadgeRewardEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewClaimBadgeRewardEvent.java index d41372e1..697a6278 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewClaimBadgeRewardEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewClaimBadgeRewardEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.users.BadgeReceivedComposer; public class HotelViewClaimBadgeRewardEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String request = this.packet.readString(); if (Emulator.getConfig().getBoolean("hotelview.badgereward." + request + ".enabled")) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestBadgeRewardEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestBadgeRewardEvent.java index edbefbdf..2fa9d455 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestBadgeRewardEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/HotelViewRequestBadgeRewardEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.hotelview.HotelViewBadgeButtonConfigCompos public class HotelViewRequestBadgeRewardEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String badge = this.packet.readString(); this.client.sendResponse(new HotelViewBadgeButtonConfigComposer(Emulator.getConfig().getValue("hotelview.badgereward." + badge + ".badge"), Emulator.getConfig().getBoolean("hotelview.badgereward." + badge + ".enabled"))); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/hotelview/QuitEvent.java b/src/main/java/com/eu/habbo/messages/incoming/hotelview/QuitEvent.java index 60637791..7c59c7b2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/hotelview/QuitEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/hotelview/QuitEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.hotelview.CloseConnectionMessageComposer; public class QuitEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.getHabbo().getHabboInfo().setLoadingRoom(0); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgePointLimitsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgePointLimitsEvent.java index e9cae16a..07a98076 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgePointLimitsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgePointLimitsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.inventory.BadgePointLimitsComposer; public class GetBadgePointLimitsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new BadgePointLimitsComposer()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgesEvent.java index c2b9b1ec..10e2d9c7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBadgesEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.inventory.BadgesComposer; public class GetBadgesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new BadgesComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBotInventoryEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBotInventoryEvent.java index 20360bfc..07eb08ce 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBotInventoryEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetBotInventoryEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.inventory.BotInventoryComposer; public class GetBotInventoryEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new BotInventoryComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/GetPetInventoryEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetPetInventoryEvent.java index e734dcb3..b0c4cee2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/inventory/GetPetInventoryEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/GetPetInventoryEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.inventory.PetInventoryComposer; public class GetPetInventoryEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new PetInventoryComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestFurniInventoryWhenNotInRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestFurniInventoryWhenNotInRoomEvent.java index 3fe39c44..e4db03f4 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestFurniInventoryWhenNotInRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestFurniInventoryWhenNotInRoomEvent.java @@ -14,7 +14,7 @@ import java.util.NoSuchElementException; public class RequestFurniInventoryWhenNotInRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int totalItems = this.client.getHabbo().getInventory().getItemsComponent().getItems().size(); if (totalItems == 0) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java index 4000d629..35393c6f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpEvent.java @@ -15,7 +15,7 @@ import java.util.List; public class CallForHelpEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (!this.client.getHabbo().getHabboStats().allowTalk()) { this.client.sendResponse(new CallForHelpDisabledNotifyMessageComposer()); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java index 001d133f..895d49f8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromIMEvent.java @@ -15,7 +15,7 @@ import java.util.ArrayList; public class CallForHelpFromIMEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (!this.client.getHabbo().getHabboStats().allowTalk()) { this.client.sendResponse(new CallForHelpDisabledNotifyMessageComposer()); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromPhotoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromPhotoEvent.java index 74239953..f6bef706 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromPhotoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CallForHelpFromPhotoEvent.java @@ -14,7 +14,7 @@ import com.eu.habbo.threading.runnables.InsertModToolIssue; public class CallForHelpFromPhotoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { boolean hasExtradataId = this.packet.readShort() != 0; this.packet.getBuffer().resetReaderIndex(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ChatReviewSessionCreateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ChatReviewSessionCreateEvent.java index 833f276b..a4aaf565 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ChatReviewSessionCreateEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ChatReviewSessionCreateEvent.java @@ -13,7 +13,7 @@ import java.util.ArrayList; public class ChatReviewSessionCreateEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboStats().allowTalk()) { this.client.sendResponse(new CallForHelpDisabledNotifyMessageComposer()); return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssueDefaultActionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssueDefaultActionEvent.java index dded06ba..7fbeffa5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssueDefaultActionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssueDefaultActionEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class CloseIssueDefaultActionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { int issueId = this.packet.readInt(); int unknown = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssuesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssuesEvent.java index 154c0566..f5775215 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssuesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/CloseIssuesEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class CloseIssuesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { int state = this.packet.readInt(); int something = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetGuideReportingStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetGuideReportingStatusEvent.java index 25616c6c..483e627c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetGuideReportingStatusEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetGuideReportingStatusEvent.java @@ -9,7 +9,7 @@ import java.util.Calendar; public class GetGuideReportingStatusEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { GuardianTicket ticket = Emulator.getGameEnvironment().getGuideManager().getRecentTicket(this.client.getHabbo()); if (ticket != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorRoomInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorRoomInfoEvent.java index 246e3276..41d1e869 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorRoomInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorRoomInfoEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.modtool.ModeratorRoomInfoComposer; public class GetModeratorRoomInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { int roomId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorUserInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorUserInfoEvent.java index c8eab63a..64f49f14 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorUserInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetModeratorUserInfoEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class GetModeratorUserInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { ModToolManager.requestUserInfo(this.client, this.packet); } else { diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetPendingCallsForHelpEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetPendingCallsForHelpEvent.java index 11502c7f..2ae55b52 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetPendingCallsForHelpEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetPendingCallsForHelpEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.modtool.CallForHelpPendingCallsMessageComp public class GetPendingCallsForHelpEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new CallForHelpPendingCallsMessageComposer(Emulator.getGameEnvironment().getModToolManager().openTicketsForHabbo(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomChatlogEvent.java index 90000c0b..19c1304e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomChatlogEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomChatlogEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.modtool.RoomChatlogComposer; public class GetRoomChatlogEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { this.packet.readInt(); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.packet.readInt()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomVisitsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomVisitsEvent.java index adfd4594..7c78de42 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomVisitsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetRoomVisitsEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.modtool.RoomVisitsComposer; public class GetRoomVisitsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { int userId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetUserChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetUserChatlogEvent.java index 99481ba2..eff8002f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/GetUserChatlogEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/GetUserChatlogEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.modtool.UserChatlogComposer; public class GetUserChatlogEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { int userId = this.packet.readInt(); String username = HabboManager.getOfflineHabboInfo(userId).getUsername(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java index d8b1c1e1..02c1e659 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModAlertEvent.java @@ -13,7 +13,7 @@ import java.util.ArrayList; public class ModAlertEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); String message = this.packet.readString(); int cfhTopic = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java index 93d1b3a7..c6b64030 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModBanEvent.java @@ -22,7 +22,7 @@ public class ModBanEvent extends MessageHandler { public final int DAY_IN_SECONDS = 24 * 60 * 60; @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); String message = this.packet.readString(); int cfhTopic = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModKickEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModKickEvent.java index 1412884a..1eff0afb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModKickEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModKickEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ModKickEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Emulator.getGameEnvironment().getModToolManager().kick(this.client.getHabbo(), Emulator.getGameEnvironment().getHabboManager().getHabbo(this.packet.readInt()), this.packet.readString()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMessageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMessageEvent.java index 2b9c1756..5bba9bf0 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMessageEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMessageEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.plugin.events.support.SupportUserAlertedReason; public class ModMessageEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { Habbo alertedUser = Emulator.getGameEnvironment().getHabboManager().getHabbo(this.packet.readInt()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java index a80dd7f5..063ebc29 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModMuteEvent.java @@ -15,7 +15,7 @@ import java.util.Date; public class ModMuteEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); String message = this.packet.readString(); int cfhTopic = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomUserChatlogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomUserChatlogEvent.java index 796becd5..f0d5a835 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomUserChatlogEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolRequestRoomUserChatlogEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.modtool.RoomChatlogComposer; public class ModToolRequestRoomUserChatlogEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { int userId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionEvent.java index ae01f3e3..1352c98f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolSanctionEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.threading.runnables.UpdateModToolIssue; public class ModToolSanctionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { int ticketId = this.packet.readInt(); int unknownInt = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolWarnEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolWarnEvent.java index e5f0b102..713ca5f5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolWarnEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModToolWarnEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.plugin.events.support.SupportUserAlertedReason; public class ModToolWarnEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { Habbo alertedUser = Emulator.getGameEnvironment().getHabboManager().getHabbo(this.packet.readInt()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java index 27acd550..f46d1e95 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModTradingLockEvent.java @@ -13,7 +13,7 @@ import java.util.ArrayList; public class ModTradingLockEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); String message = this.packet.readString(); int duration = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModerateRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModerateRoomEvent.java index c75dd8ff..ff49f916 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModerateRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModerateRoomEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ModerateRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.packet.readInt()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModeratorActionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModeratorActionEvent.java index 1ecdaf55..b5ae08d4 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ModeratorActionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ModeratorActionEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ModeratorActionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { int type = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/PickIssuesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/PickIssuesEvent.java index 539a0cba..baca0eba 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/PickIssuesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/PickIssuesEvent.java @@ -12,7 +12,7 @@ public class PickIssuesEvent extends MessageHandler { public static boolean send = false; @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { this.packet.readInt(); ModToolIssue issue = Emulator.getGameEnvironment().getModToolManager().getTicket(this.packet.readInt()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReleaseIssuesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReleaseIssuesEvent.java index 6779cb9a..ac0d562c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/ReleaseIssuesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/ReleaseIssuesEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ReleaseIssuesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_SUPPORTTOOL)) { int count = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/modtool/StartSafetyQuizEvent.java b/src/main/java/com/eu/habbo/messages/incoming/modtool/StartSafetyQuizEvent.java index 572dfdcd..c4080181 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/modtool/StartSafetyQuizEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/modtool/StartSafetyQuizEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class StartSafetyQuizEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String quizName = this.packet.readString(); AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("SafetyQuizGraduate")); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/CanCreateRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/CanCreateRoomEvent.java index b354cc34..34d66119 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/CanCreateRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/CanCreateRoomEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.navigator.CanCreateRoomComposer; public class CanCreateRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int count = Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()).size(); int max = this.client.getHabbo().getHabboStats().hasActiveClub() ? RoomManager.MAXIMUM_ROOMS_HC : RoomManager.MAXIMUM_ROOMS_USER; this.client.sendResponse(new CanCreateRoomComposer(count, max)); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/CreateFlatEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/CreateFlatEvent.java index 8eb41a1f..f5e949db 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/CreateFlatEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/CreateFlatEvent.java @@ -13,7 +13,7 @@ import lombok.extern.slf4j.Slf4j; public class CreateFlatEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String name = this.packet.readString(); String description = this.packet.readString(); String modelName = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteRoomEvent.java index 0b64e4c9..7ec78be7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/DeleteRoomEvent.java @@ -24,7 +24,7 @@ public class DeleteRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomId = this.packet.readInt(); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/ForwardToSomeRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/ForwardToSomeRoomEvent.java index e491fc56..4b0b6c3d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/ForwardToSomeRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/ForwardToSomeRoomEvent.java @@ -11,7 +11,7 @@ import java.util.Collections; public class ForwardToSomeRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String data = this.packet.readString(); if (data.equals("random_friending_room")) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/GetPopularRoomTagsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetPopularRoomTagsEvent.java index f74205b2..808f096a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/GetPopularRoomTagsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetPopularRoomTagsEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.PopularRoomTagsResultComposer; public class GetPopularRoomTagsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new PopularRoomTagsResultComposer(Emulator.getGameEnvironment().getRoomManager().getTags())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUnreadForumsCountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUnreadForumsCountEvent.java index 23aa535d..fe474e3a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUnreadForumsCountEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUnreadForumsCountEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class GetUnreadForumsCountEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsPromoted())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserEventCatsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserEventCatsEvent.java index 0e247dc3..17084d2b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserEventCatsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserEventCatsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.navigator.NewNavigatorPreferencesComposer; public class GetUserEventCatsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new NewNavigatorPreferencesComposer(this.client.getHabbo().getHabboStats().getNavigatorWindowSettings())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserFlatCatsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserFlatCatsEvent.java index 5c105db2..3d3e1e26 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserFlatCatsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/GetUserFlatCatsEvent.java @@ -9,7 +9,7 @@ import java.util.List; public class GetUserFlatCatsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { List roomCategoryList = Emulator.getGameEnvironment().getRoomManager().roomCategoriesForHabbo(this.client.getHabbo()); this.client.sendResponse(new UserFlatCatsComposer(roomCategoryList)); //this.client.sendResponse(new NewNavigatorEventCategoriesComposer()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFavouriteRoomsSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFavouriteRoomsSearchEvent.java index 482883d7..739bcad7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFavouriteRoomsSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFavouriteRoomsSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class MyFavouriteRoomsSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFavourite(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFriendsRoomsSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFriendsRoomsSearchEvent.java index d477517d..4c065263 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFriendsRoomsSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyFriendsRoomsSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class MyFriendsRoomsSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsOwn(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyGuildBasesSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyGuildBasesSearchEvent.java index da6f9ba8..865015ae 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyGuildBasesSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyGuildBasesSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class MyGuildBasesSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsInGroup())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomHistorySearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomHistorySearchEvent.java index bd7c3a04..aecda66e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomHistorySearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomHistorySearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class MyRoomHistorySearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsVisited(this.client.getHabbo(), false, 25))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomRightsSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomRightsSearchEvent.java index f5ad8489..4bb32467 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomRightsSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomRightsSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class MyRoomRightsSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithRights(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomsSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomsSearchEvent.java index 86ccf32e..8b18b8dc 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomsSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/MyRoomsSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class MyRoomsSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddCollapsedCategoryEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddCollapsedCategoryEvent.java index e0fc09b5..6ef6beee 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddCollapsedCategoryEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddCollapsedCategoryEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class NavigatorAddCollapsedCategoryEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String category = this.packet.readString(); this.client.getHabbo().getHabboStats().getNavigatorWindowSettings().setDisplayMode(category, DisplayMode.COLLAPSED); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddSavedSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddSavedSearchEvent.java index a15b9ff9..4579ea31 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddSavedSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorAddSavedSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.NavigatorSavedSearchesComposer; public class NavigatorAddSavedSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String searchCode = this.packet.readString(); String filter = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorDeleteSavedSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorDeleteSavedSearchEvent.java index e1e7dc83..0c209c3e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorDeleteSavedSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorDeleteSavedSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.NavigatorSavedSearchesComposer; public class NavigatorDeleteSavedSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int searchId = this.packet.readInt(); NavigatorSavedSearch search = null; diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorRemoveCollapsedCategoryEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorRemoveCollapsedCategoryEvent.java index 053e62a3..f9580683 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorRemoveCollapsedCategoryEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorRemoveCollapsedCategoryEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class NavigatorRemoveCollapsedCategoryEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String category = this.packet.readString(); this.client.getHabbo().getHabboStats().getNavigatorWindowSettings().setDisplayMode(category, DisplayMode.VISIBLE); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorSetSearchCodeViewModeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorSetSearchCodeViewModeEvent.java index b227a574..6ecd2dff 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorSetSearchCodeViewModeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NavigatorSetSearchCodeViewModeEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class NavigatorSetSearchCodeViewModeEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String category = this.packet.readString(); int viewMode = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorInitEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorInitEvent.java index 9588e290..30fc928e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorInitEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorInitEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.navigator.*; public class NewNavigatorInitEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new NewNavigatorPreferencesComposer(this.client.getHabbo().getHabboStats().getNavigatorWindowSettings())); this.client.sendResponse(new NavigatorMetaDataComposer()); this.client.sendResponse(new NavigatorLiftedRoomsComposer()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorSearchEvent.java index 6b3c5d4b..1ba345b6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/NewNavigatorSearchEvent.java @@ -17,7 +17,7 @@ import java.util.List; @Slf4j public class NewNavigatorSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String view = this.packet.readString(); String query = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/PopularRoomsSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/PopularRoomsSearchEvent.java index 4e5e8f02..f6734d32 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/PopularRoomsSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/PopularRoomsSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class PopularRoomsSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getActiveRooms(-1))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPublicRoomsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPublicRoomsEvent.java index 2961d89c..0fb4c499 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPublicRoomsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RequestPublicRoomsEvent.java @@ -5,6 +5,6 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RequestPublicRoomsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomTextSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomTextSearchEvent.java index 592d1c0f..18e87495 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomTextSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomTextSearchEvent.java @@ -15,7 +15,7 @@ public class RoomTextSearchEvent extends MessageHandler { public final static THashMap> cachedResults = new THashMap<>(4); @Override - public void handle() throws Exception { + public void handle() { String name = this.packet.readString(); String prefix = ""; diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWhereMyFriendsAreSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWhereMyFriendsAreSearchEvent.java index 373e5a83..8c547dbc 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWhereMyFriendsAreSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWhereMyFriendsAreSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class RoomsWhereMyFriendsAreSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsFriendsNow(this.client.getHabbo()))); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWithHighestScoreSearchEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWithHighestScoreSearchEvent.java index a704d284..e6aa10a8 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWithHighestScoreSearchEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/RoomsWithHighestScoreSearchEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class RoomsWithHighestScoreSearchEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsByScore())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsByTagEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsByTagEvent.java index f48d6fa5..12b5db25 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsByTagEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SearchRoomsByTagEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.navigator.GuestRoomSearchResultComposer; public class SearchRoomsByTagEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String tag = this.packet.readString(); this.client.sendResponse(new GuestRoomSearchResultComposer(Emulator.getGameEnvironment().getRoomManager().getRoomsWithTag(tag))); diff --git a/src/main/java/com/eu/habbo/messages/incoming/navigator/SetNewNavigatorWindowPreferencesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/navigator/SetNewNavigatorWindowPreferencesEvent.java index 961d0273..4f9c4d2b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/navigator/SetNewNavigatorWindowPreferencesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/navigator/SetNewNavigatorWindowPreferencesEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class SetNewNavigatorWindowPreferencesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { HabboNavigatorWindowSettings windowSettings = this.client.getHabbo().getHabboStats().getNavigatorWindowSettings(); windowSettings.setX(this.packet.readInt()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java b/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java index 24c7c078..bf9053eb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/polls/AnswerPollEvent.java @@ -15,7 +15,7 @@ import java.sql.SQLException; @Slf4j public class AnswerPollEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int pollId = this.packet.readInt(); int questionId = this.packet.readInt(); int count = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/polls/PollRejectEvent.java b/src/main/java/com/eu/habbo/messages/incoming/polls/PollRejectEvent.java index bb064b91..d315a10c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/polls/PollRejectEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/polls/PollRejectEvent.java @@ -13,7 +13,7 @@ import java.sql.SQLException; public class PollRejectEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int pollId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/polls/PollStartEvent.java b/src/main/java/com/eu/habbo/messages/incoming/polls/PollStartEvent.java index 218fe106..093df4e7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/polls/PollStartEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/polls/PollStartEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.polls.PollContentsComposer; public class PollStartEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int pollId = this.packet.readInt(); Poll poll = Emulator.getGameEnvironment().getPollManager().getPoll(pollId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/AddFavouriteRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/AddFavouriteRoomEvent.java index 5c1509c1..726cb9cd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/AddFavouriteRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/AddFavouriteRoomEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.FavouriteChangedComposer; public class AddFavouriteRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomId = this.packet.readInt(); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/DeleteFavouriteRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/DeleteFavouriteRoomEvent.java index 98d815ea..ae943e23 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/DeleteFavouriteRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/DeleteFavouriteRoomEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.FavouriteChangedComposer; public class DeleteFavouriteRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomId = this.packet.readInt(); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetBannedUsersFromRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetBannedUsersFromRoomEvent.java index f0c1cc71..4918cf88 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetBannedUsersFromRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetBannedUsersFromRoomEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.rooms.BannedUsersFromRoomComposer; public class GetBannedUsersFromRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomId = this.packet.readInt(); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetCustomRoomFilterEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetCustomRoomFilterEvent.java index fc492806..b1339c5e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetCustomRoomFilterEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetCustomRoomFilterEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.rooms.RoomFilterSettingsMessageComposer; public class GetCustomRoomFilterEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.packet.readInt()); if (room != null && room.hasRights(this.client.getHabbo())) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetFlatControllersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetFlatControllersEvent.java index 91ea8f9e..4c301c3a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetFlatControllersEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetFlatControllersEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.FlatControllersComposer; public class GetFlatControllersEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetGuestRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetGuestRoomEvent.java index b00b1d28..ffaddec2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetGuestRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetGuestRoomEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer; public class GetGuestRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(this.packet.readInt()); int something = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomEntryDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomEntryDataEvent.java index 030d6bd7..bab4015c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomEntryDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomEntryDataEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.rooms.HeightMapComposer; public class GetRoomEntryDataEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getLoadingRoom() > 0) { Room room = Emulator.getGameEnvironment().getRoomManager().loadRoom(this.client.getHabbo().getHabboInfo().getLoadingRoom()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomSettingsEvent.java index c41c660b..b9c450f4 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/GetRoomSettingsEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.RoomSettingsDataComposer; public class GetRoomSettingsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomId = this.packet.readInt(); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/LetUserInEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/LetUserInEvent.java index 494dc37b..74a5f0e7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/LetUserInEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/LetUserInEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.rooms.FlatAccessibleMessageComposer; public class LetUserInEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null && this.client.getHabbo().getHabboInfo().getCurrentRoom().hasRights(this.client.getHabbo())) { String username = this.packet.readString(); boolean accepted = this.packet.readBoolean(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/MuteAllInRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/MuteAllInRoomEvent.java index b62e762b..8711ef77 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/MuteAllInRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/MuteAllInRoomEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.rooms.MuteAllInRoomComposer; public class MuteAllInRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/OpenFlatConnectionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/OpenFlatConnectionEvent.java index 94903a00..9335f7c9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/OpenFlatConnectionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/OpenFlatConnectionEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class OpenFlatConnectionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomId = this.packet.readInt(); String password = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RateFlatEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RateFlatEvent.java index 1de3fd66..683e5a18 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RateFlatEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RateFlatEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RateFlatEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Emulator.getGameEnvironment().getRoomManager().voteForRoom(this.client.getHabbo(), this.client.getHabbo().getHabboInfo().getCurrentRoom()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveAllRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveAllRightsEvent.java index 85b26f9d..d7e18764 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveAllRightsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveAllRightsEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.NoSuchFlatComposer; public class RemoveAllRightsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { final Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null || room.getId() != this.packet.readInt()) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveOwnRoomRightsRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveOwnRoomRightsRoomEvent.java index 95153ac5..b5bace40 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveOwnRoomRightsRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RemoveOwnRoomRightsRoomEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RemoveOwnRoomRightsRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomId = this.packet.readInt(); Emulator.getGameEnvironment().getRoomManager().getRoom(roomId).removeRights(this.client.getHabbo().getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestHeightmapEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestHeightmapEvent.java index e6311df8..e40258eb 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestHeightmapEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestHeightmapEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RequestHeightmapEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getLoadingRoom() > 0) { Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(this.client.getHabbo().getHabboInfo().getLoadingRoom()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomPropertySet.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomPropertySet.java index 16eb8b57..a9e9fc63 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomPropertySet.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/RequestRoomPropertySet.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.rooms.RoomPropertyMessageComposer; public class RequestRoomPropertySet extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/SaveRoomSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/SaveRoomSettingsEvent.java index 6baaa589..e5aabc49 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/SaveRoomSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/SaveRoomSettingsEvent.java @@ -14,7 +14,7 @@ public class SaveRoomSettingsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomId = this.packet.readInt(); Room room = Emulator.getGameEnvironment().getRoomManager().getRoom(roomId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/SetRoomBackgroundColorDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/SetRoomBackgroundColorDataEvent.java index 6a0472d2..7733496d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/SetRoomBackgroundColorDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/SetRoomBackgroundColorDataEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.plugin.events.furniture.FurnitureRoomTonerEvent; public class SetRoomBackgroundColorDataEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); @@ -31,9 +31,9 @@ public class SetRoomBackgroundColorDataEvent extends MessageHandler { if (event.isCancelled()) return; - hue = event.hue % 256; - saturation = event.saturation % 256; - brightness = event.brightness % 256; + hue = event.getHue() % 256; + saturation = event.getSaturation() % 256; + brightness = event.getBrightness() % 256; item.setExtradata(item.getExtradata().split(":")[0] + ":" + hue + ":" + saturation + ":" + brightness); item.needsUpdate(true); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/SubmitRoomToCompetitionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/SubmitRoomToCompetitionEvent.java index 4110cea0..f6a1b5e4 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/SubmitRoomToCompetitionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/SubmitRoomToCompetitionEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.rooms.GetGuestRoomResultComposer; public class SubmitRoomToCompetitionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().hasPermission(Permission.ACC_STAFF_PICK)) { int roomId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateHomeRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateHomeRoomEvent.java index 430c6403..7caab036 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateHomeRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateHomeRoomEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.users.NavigatorSettingsComposer; public class UpdateHomeRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomId = this.packet.readInt(); if (roomId != this.client.getHabbo().getHabboInfo().getHomeRoom()) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateRoomFilterEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateRoomFilterEvent.java index d04570a9..b8df73ab 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateRoomFilterEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/UpdateRoomFilterEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class UpdateRoomFilterEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { final int roomId = this.packet.readInt(); final boolean add = this.packet.readBoolean(); String word = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/CommandBotEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/CommandBotEvent.java index bcab8ff4..e645c105 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/CommandBotEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/CommandBotEvent.java @@ -20,7 +20,7 @@ import java.util.ArrayList; public class CommandBotEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) @@ -45,9 +45,9 @@ public class CommandBotEvent extends MessageHandler { Emulator.getPluginManager().fireEvent(lookEvent); if (lookEvent.isCancelled()) break; - bot.setFigure(lookEvent.newLook); - bot.setGender(lookEvent.gender); - bot.setEffect(lookEvent.effect, -1); + bot.setFigure(lookEvent.getNewLook()); + bot.setGender(lookEvent.getGender()); + bot.setEffect(lookEvent.getEffect(), -1); bot.needsUpdate(true); } case 2 -> { @@ -97,9 +97,9 @@ public class CommandBotEvent extends MessageHandler { Emulator.getPluginManager().fireEvent(chatEvent); if (chatEvent.isCancelled()) break; - bot.setChatAuto(chatEvent.autoChat); - bot.setChatRandom(chatEvent.randomChat); - bot.setChatDelay((short) chatEvent.chatDelay); + bot.setChatAuto(chatEvent.isAutoChat()); + bot.setChatRandom(chatEvent.isRandomChat()); + bot.setChatDelay((short) chatEvent.getChatDelay()); bot.clearChat(); bot.addChatLines(chat); bot.needsUpdate(true); @@ -127,9 +127,9 @@ public class CommandBotEvent extends MessageHandler { if (nameEvent.isCancelled()) break; - bot.setName(nameEvent.name); + bot.setName(nameEvent.getName()); bot.needsUpdate(true); - room.sendComposer(new UserNameChangedMessageComposer(bot.getRoomUnit().getId(), bot.getRoomUnit().getId(), nameEvent.name).compose()); + room.sendComposer(new UserNameChangedMessageComposer(bot.getRoomUnit().getId(), bot.getRoomUnit().getId(), nameEvent.getName()).compose()); } } if (invalidName) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/GetBotCommandConfigurationDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/GetBotCommandConfigurationDataEvent.java index 3e7387ce..2dbe51c3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/GetBotCommandConfigurationDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/GetBotCommandConfigurationDataEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.rooms.BotCommandConfigurationComposer; public class GetBotCommandConfigurationDataEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/PlaceBotEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/PlaceBotEvent.java index a15b9aa9..ed6cea2d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/PlaceBotEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/PlaceBotEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class PlaceBotEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/RemoveBotFromFlatEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/RemoveBotFromFlatEvent.java index c940c41a..87189997 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/RemoveBotFromFlatEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/bots/RemoveBotFromFlatEvent.java @@ -8,7 +8,7 @@ public class RemoveBotFromFlatEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/AddSpamWallPostItEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/AddSpamWallPostItEvent.java index 3d04cee2..bc418af6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/AddSpamWallPostItEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/AddSpamWallPostItEvent.java @@ -16,7 +16,7 @@ public class AddSpamWallPostItEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CreditFurniRedeemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CreditFurniRedeemEvent.java index a9a46858..bb577502 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CreditFurniRedeemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CreditFurniRedeemEvent.java @@ -17,7 +17,7 @@ import lombok.extern.slf4j.Slf4j; public class CreditFurniRedeemEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CustomizeAvatarWithFurniEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CustomizeAvatarWithFurniEvent.java index 5dd07465..937aae78 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CustomizeAvatarWithFurniEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/CustomizeAvatarWithFurniEvent.java @@ -23,7 +23,7 @@ public class CustomizeAvatarWithFurniEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null && diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/DiceOffEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/DiceOffEvent.java index 1fe01c5e..6fda922f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/DiceOffEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/DiceOffEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class DiceOffEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/GetItemDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/GetItemDataEvent.java index 689d77e1..d78c2b42 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/GetItemDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/GetItemDataEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.ItemDataUpdateMessageComposer; public class GetItemDataEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveObjectEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveObjectEvent.java index c17d563b..a2dd1bf2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveObjectEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveObjectEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.ObjectUpdateMessageComposer; public class MoveObjectEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveWallItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveWallItemEvent.java index 01095935..f81d31af 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveWallItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/MoveWallItemEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.NotificationDialogMessageCo public class MoveWallItemEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PickupObjectEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PickupObjectEvent.java index 4557af6e..8755eb93 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PickupObjectEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PickupObjectEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class PickupObjectEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int category = this.packet.readInt(); //10 = floorItem and 20 = wallItem int itemId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlaceObjectEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlaceObjectEvent.java index c75a5a66..5ba6485e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlaceObjectEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlaceObjectEvent.java @@ -15,7 +15,7 @@ import com.eu.habbo.messages.outgoing.inventory.FurniListRemoveComposer; public class PlaceObjectEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String[] values = this.packet.readString().split(" "); int itemId = -1; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlacePostItEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlacePostItEvent.java index cd1d7e99..1f6eee07 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlacePostItEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/PlacePostItEvent.java @@ -15,7 +15,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.ItemAddMessageComposer; public class PlacePostItEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); String location = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RemoveItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RemoveItemEvent.java index fe98c1a1..53c1f789 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RemoveItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RemoveItemEvent.java @@ -12,7 +12,7 @@ import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; public class RemoveItemEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerChangeStateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerChangeStateEvent.java index d0610ace..2ba8cb82 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerChangeStateEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerChangeStateEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RoomDimmerChangeStateEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if ((room.getGuildId() > 0 && room.getGuildRightLevel(this.client.getHabbo()).isLessThan(RoomRightLevels.GUILD_RIGHTS)) && !room.hasRights(this.client.getHabbo())) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerGetPresetsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerGetPresetsEvent.java index ee1f6782..fbfb8fb5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerGetPresetsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerGetPresetsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.RoomDimmerPresetsComposer; public class RoomDimmerGetPresetsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) this.client.sendResponse(new RoomDimmerPresetsComposer(this.client.getHabbo().getHabboInfo().getCurrentRoom().getMoodlightData())); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerSavePresetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerSavePresetEvent.java index c1ce005e..122f0902 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerSavePresetEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RoomDimmerSavePresetEvent.java @@ -14,11 +14,11 @@ import java.util.Arrays; import java.util.List; public class RoomDimmerSavePresetEvent extends MessageHandler { - public static List MOODLIGHT_AVAILABLE_COLORS = Arrays.asList("#74F5F5,#0053F7,#E759DE,#EA4532,#F2F851,#82F349,#000000".split(",")); - public static int MIN_BRIGHTNESS = (int) Math.floor(0.3 * 0xFF); + private static final List MOODLIGHT_AVAILABLE_COLORS = Arrays.asList("#74F5F5,#0053F7,#E759DE,#EA4532,#F2F851,#82F349,#000000".split(",")); + private static final int MIN_BRIGHTNESS = (int) Math.floor(0.3 * 0xFF); @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if ((room.getGuildId() <= 0 && room.getGuildRightLevel(this.client.getHabbo()).isLessThan(RoomRightLevels.GUILD_RIGHTS)) && !room.hasRights(this.client.getHabbo())) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetClothingChangeDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetClothingChangeDataEvent.java index 8c4fb012..5820a0f2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetClothingChangeDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetClothingChangeDataEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class SetClothingChangeDataEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null || this.client.getHabbo().getHabboInfo().getId() != room.getOwnerId()) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java index b5b0fcfc..0dfc6682 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetCustomStackingHeightEvent.java @@ -11,7 +11,7 @@ import gnu.trove.set.hash.THashSet; public class SetCustomStackingHeightEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetItemDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetItemDataEvent.java index 3913e7d9..886c4b26 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetItemDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetItemDataEvent.java @@ -15,7 +15,7 @@ public class SetItemDataEvent extends MessageHandler { private static final List COLORS = Arrays.asList("9CCEFF", "FF9CFF", "9CFF9C", "FFFF33"); @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); String color = this.packet.readString(); String text = this.packet.readString().replace(((char) 9) + "", ""); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinFigureEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinFigureEvent.java index 3ede31d7..0e924d12 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinFigureEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinFigureEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class SetMannequinFigureEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Habbo habbo = this.client.getHabbo(); Room room = habbo.getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinNameEvent.java index e44adf96..825d2649 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinNameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetMannequinNameEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class SetMannequinNameEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null || !room.isOwner(this.client.getHabbo())) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetObjectDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetObjectDataEvent.java index 39a57a9c..cc971be5 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetObjectDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetObjectDataEvent.java @@ -10,7 +10,7 @@ import gnu.trove.map.hash.THashMap; public class SetObjectDataEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetRandomStateEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetRandomStateEvent.java index c4c7c2b0..9ffa42ef 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetRandomStateEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/SetRandomStateEvent.java @@ -10,7 +10,7 @@ import lombok.extern.slf4j.Slf4j; public class SetRandomStateEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { try { int itemId = this.packet.readInt(); int state = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseFurnitureEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseFurnitureEvent.java index 25534e3e..ff9a2e2e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseFurnitureEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/UseFurnitureEvent.java @@ -21,7 +21,7 @@ public class UseFurnitureEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { try { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/AddJukeboxDiskEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/AddJukeboxDiskEvent.java index 6b02232d..da481cc1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/AddJukeboxDiskEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/AddJukeboxDiskEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class AddJukeboxDiskEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (!this.client.getHabbo().getHabboInfo().getCurrentRoom().hasRights(this.client.getHabbo())) return; int itemId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetJukeboxPlayListEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetJukeboxPlayListEvent.java index 48719216..f9053c63 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetJukeboxPlayListEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetJukeboxPlayListEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventory public class GetJukeboxPlayListEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager(); this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength())); this.client.sendResponse(new UserSongDisksInventoryMessageComposer(traxManager.myList(this.client.getHabbo()))); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetNowPlayingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetNowPlayingEvent.java index c284ed03..124ec4fe 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetNowPlayingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/GetNowPlayingEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventory public class GetNowPlayingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager(); this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength())); this.client.sendResponse(new UserSongDisksInventoryMessageComposer(traxManager.myList(this.client.getHabbo()))); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java index 81f67513..edd83c1b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/JukeBoxEventOne.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.jukebox.UserSongDisksInventory public class JukeBoxEventOne extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { TraxManager traxManager = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager(); this.client.sendResponse(new JukeboxSongDisksMessageComposer(traxManager.getSongs(), traxManager.totalLength())); this.client.sendResponse(new UserSongDisksInventoryMessageComposer(traxManager.myList(this.client.getHabbo()))); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/RemoveJukeboxDiskEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/RemoveJukeboxDiskEvent.java index d978652d..7902048d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/RemoveJukeboxDiskEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/jukebox/RemoveJukeboxDiskEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RemoveJukeboxDiskEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int index = this.packet.readInt(); InteractionMusicDisc musicDisc = this.client.getHabbo().getHabboInfo().getCurrentRoom().getTraxManager().getSongs().get(index); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/FriendFurniConfirmLockEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/FriendFurniConfirmLockEvent.java index ef16fc95..98313948 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/FriendFurniConfirmLockEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/lovelock/FriendFurniConfirmLockEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.rooms.items.lovelock.FriendFurniOtherLockC public class FriendFurniConfirmLockEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); if (this.packet.readBoolean()) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceCancelRentEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceCancelRentEvent.java index 381aa794..5e9b15c9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceCancelRentEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceCancelRentEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RentableSpaceCancelRentEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceRentEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceRentEvent.java index 059ffefd..5dc6abb7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceRentEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/rentablespace/RentableSpaceRentEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RentableSpaceRentEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java index d80ca722..3556a332 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/ControlYoutubeDisplayPlaybackEvent.java @@ -37,7 +37,7 @@ public class ControlYoutubeDisplayPlaybackEvent extends MessageHandler { } @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); YoutubeState state = YoutubeState.getByState(this.packet.readInt()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/GetYoutubeDisplayStatusEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/GetYoutubeDisplayStatusEvent.java index baf1e880..4dfc7fd1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/GetYoutubeDisplayStatusEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/GetYoutubeDisplayStatusEvent.java @@ -16,7 +16,7 @@ public class GetYoutubeDisplayStatusEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java index b509ec47..7c09d967 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/SetYoutubeDisplayPlaylistEvent.java @@ -15,7 +15,7 @@ import java.util.Optional; public class SetYoutubeDisplayPlaylistEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); String playlistId = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedPetsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedPetsEvent.java index c913b24b..016aafba 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedPetsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/BreedPetsEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class BreedPetsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int unknownInt = this.packet.readInt(); //Something state. 2 = accept if (unknownInt == 0) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CancelPetBreedingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CancelPetBreedingEvent.java index 1e663d1f..58b0dc53 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CancelPetBreedingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CancelPetBreedingEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class CancelPetBreedingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); HabboItem item = this.client.getHabbo().getHabboInfo().getCurrentRoom().getHabboItem(itemId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostPlantEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostPlantEvent.java index 3e0af6fa..f024f092 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostPlantEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CompostPlantEvent.java @@ -19,7 +19,7 @@ public class CompostPlantEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int petId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ConfirmPetBreedingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ConfirmPetBreedingEvent.java index 00bfa4a3..bc0c0fbf 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ConfirmPetBreedingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/ConfirmPetBreedingEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ConfirmPetBreedingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); String name = this.packet.readString(); int petOneId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CustomizePetWithFurniEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CustomizePetWithFurniEvent.java index 831dff09..b22f37ab 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CustomizePetWithFurniEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/CustomizePetWithFurniEvent.java @@ -17,7 +17,7 @@ import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; public class CustomizePetWithFurniEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetCommandsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetCommandsEvent.java index d3cbad29..e3dbf722 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetCommandsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetCommandsEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.rooms.pets.PetTrainingPanelComposer; public class GetPetCommandsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int petId = this.packet.readInt(); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetInfoEvent.java index 276e7531..f357f711 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/GetPetInfoEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.pets.PetInfoMessageComposer; public class GetPetInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int petId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java index 3560895b..eeab20d1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MountPetEvent.java @@ -13,7 +13,7 @@ import java.util.List; public class MountPetEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int petId = this.packet.readInt(); Habbo habbo = this.client.getHabbo(); Room room = habbo.getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MovePetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MovePetEvent.java index 1e442e13..9a9cfcdd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MovePetEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/MovePetEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.UserUpdateComposer; public class MovePetEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Pet pet = this.client.getHabbo().getHabboInfo().getCurrentRoom().getPet(this.packet.readInt()); if (pet != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/OpenPetPackageEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/OpenPetPackageEvent.java index 26502132..9a8a27c6 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/OpenPetPackageEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/OpenPetPackageEvent.java @@ -14,7 +14,7 @@ import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; public class OpenPetPackageEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); String name = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PlacePetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PlacePetEvent.java index 740845d5..7a002cc0 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PlacePetEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/PlacePetEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.rooms.pets.RoomPetComposer; public class PlacePetEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemovePetFromFlatEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemovePetFromFlatEvent.java index 4cf1be9d..abaf92c1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemovePetFromFlatEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemovePetFromFlatEvent.java @@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.inventory.PetAddedToInventoryComposer; public class RemovePetFromFlatEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int petId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemoveSaddleFromPetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemoveSaddleFromPetEvent.java index 8b3a1d87..269f5abe 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemoveSaddleFromPetEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RemoveSaddleFromPetEvent.java @@ -22,7 +22,7 @@ public class RemoveSaddleFromPetEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); Pet pet = room.getPet(this.packet.readInt()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RespectPetEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RespectPetEvent.java index 3ca3fa26..baf8bfb7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RespectPetEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/RespectPetEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RespectPetEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { final int petId = this.packet.readInt(); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetBreedingPermissionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetBreedingPermissionEvent.java index 970fac77..45633ef4 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetBreedingPermissionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetBreedingPermissionEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class TogglePetBreedingPermissionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int petId = this.packet.readInt(); Pet pet = this.client.getHabbo().getHabboInfo().getCurrentRoom().getPet(petId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetRidingPermissionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetRidingPermissionEvent.java index f90c0680..566c1de0 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetRidingPermissionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/pets/TogglePetRidingPermissionEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.rooms.pets.PetFigureUpdateComposer; public class TogglePetRidingPermissionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int petId = this.packet.readInt(); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/EditEventEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/EditEventEvent.java index 52c56ba2..1234438e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/EditEventEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/EditEventEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.rooms.promotions.RoomEventComposer; public class EditEventEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int id = this.packet.readInt(); String promotionName = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/GetRoomAdPurchaseInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/GetRoomAdPurchaseInfoEvent.java index a7ff11ad..275f8ee3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/GetRoomAdPurchaseInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/GetRoomAdPurchaseInfoEvent.java @@ -9,7 +9,7 @@ import java.util.List; public class GetRoomAdPurchaseInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { List roomsToShow = Emulator.getGameEnvironment().getRoomManager().getRoomsForHabbo(this.client.getHabbo()); roomsToShow.addAll(Emulator.getGameEnvironment().getRoomManager().getRoomsWithRights(this.client.getHabbo())); roomsToShow.addAll(Emulator.getGameEnvironment().getRoomManager().getRoomsWithAdminRights(this.client.getHabbo())); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/PurchaseRoomAdEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/PurchaseRoomAdEvent.java index 23ef5943..bb955317 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/PurchaseRoomAdEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/promotions/PurchaseRoomAdEvent.java @@ -16,7 +16,7 @@ public class PurchaseRoomAdEvent extends MessageHandler { public static String ROOM_PROMOTION_BADGE = "RADZZ"; @Override - public void handle() throws Exception { + public void handle() { int pageId = this.packet.readInt(); int itemId = this.packet.readInt(); int roomId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AssignRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AssignRightsEvent.java index e180b63c..96d9376b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AssignRightsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AssignRightsEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.plugin.events.users.UserRightsGivenEvent; public class AssignRightsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AvatarExpressionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AvatarExpressionEvent.java index 2fc3fa8a..b7efb012 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AvatarExpressionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/AvatarExpressionEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.plugin.events.users.UserIdleEvent; public class AvatarExpressionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { Habbo habbo = this.client.getHabbo(); @@ -32,7 +32,7 @@ public class AvatarExpressionEvent extends MessageHandler { Emulator.getPluginManager().fireEvent(event); if (!event.isCancelled()) { - if (event.idle) { + if (event.isIdle()) { room.idle(habbo); } else { room.unIdle(habbo); @@ -43,7 +43,7 @@ public class AvatarExpressionEvent extends MessageHandler { Emulator.getPluginManager().fireEvent(event); if (!event.isCancelled()) { - if (!event.idle) { + if (!event.isIdle()) { room.unIdle(habbo); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/BanUserWithDurationEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/BanUserWithDurationEvent.java index 2bc6a483..106a953d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/BanUserWithDurationEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/BanUserWithDurationEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class BanUserWithDurationEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); int roomId = this.packet.readInt(); String banName = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/CancelTypingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/CancelTypingEvent.java index 16a28869..dc309636 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/CancelTypingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/CancelTypingEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.UserTypingMessageComposer; public class CancelTypingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) { return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChangePostureEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChangePostureEvent.java index e314fe2f..f71580fa 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChangePostureEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChangePostureEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.plugin.events.users.UserIdleEvent; public class ChangePostureEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { if (this.client.getHabbo().getRoomUnit().isWalking()) { this.client.getHabbo().getRoomUnit().stopWalking(); @@ -17,7 +17,7 @@ public class ChangePostureEvent extends MessageHandler { Emulator.getPluginManager().fireEvent(event); if (!event.isCancelled()) { - if (!event.idle) { + if (!event.isIdle()) { this.client.getHabbo().getHabboInfo().getCurrentRoom().unIdle(this.client.getHabbo()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChatEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChatEvent.java index 52d74b2e..8a095856 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChatEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ChatEvent.java @@ -15,7 +15,7 @@ public class ChatEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DanceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DanceEvent.java index bf678950..58dec5ae 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DanceEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DanceEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.plugin.events.users.UserIdleEvent; public class DanceEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; @@ -35,7 +35,7 @@ public class DanceEvent extends MessageHandler { Emulator.getPluginManager().fireEvent(event); if (!event.isCancelled()) { - if (!event.idle) { + if (!event.isIdle()) { this.client.getHabbo().getHabboInfo().getCurrentRoom().unIdle(habbo); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DropCarryItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DropCarryItemEvent.java index 30833754..5f87c859 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DropCarryItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/DropCarryItemEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.CarryObjectMessageComposer; public class DropCarryItemEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); this.client.getHabbo().getRoomUnit().setHandItem(0); if (room != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/GetUserTagsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/GetUserTagsEvent.java index 33adc870..0e485506 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/GetUserTagsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/GetUserTagsEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.UserTagsMessageComposer; public class GetUserTagsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int roomUnitId = this.packet.readInt(); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreUserEvent.java index 892e7702..9dab2387 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreUserEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/IgnoreUserEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer; public class IgnoreUserEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/LookToEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/LookToEvent.java index 072088c4..93b7eb17 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/LookToEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/LookToEvent.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class LookToEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java index e16ce5e8..d456df5c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/MoveAvatarEvent.java @@ -82,7 +82,7 @@ public class MoveAvatarEvent extends MessageHandler { Emulator.getPluginManager().fireEvent(event); if (!event.isCancelled()) { - if (!event.idle) { + if (!event.isIdle()) { if (roomUnit.getRoom() != null) roomUnit.getRoom().unIdle(habbo); roomUnit.resetIdleTimer(); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/PassCarryItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/PassCarryItemEvent.java index b28aef05..ef606c0b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/PassCarryItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/PassCarryItemEvent.java @@ -12,7 +12,7 @@ import java.util.List; public class PassCarryItemEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RemoveRightsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RemoveRightsEvent.java index 7bed545b..c53a97ec 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RemoveRightsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RemoveRightsEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RemoveRightsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int amount = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RespectUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RespectUserEvent.java index 085e814f..e0211d32 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RespectUserEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RespectUserEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.plugin.events.users.UserRespectedEvent; public class RespectUserEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); if (userId == client.getHabbo().getHabboInfo().getId()) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserKickEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserKickEvent.java index 1537e753..b5b5a6a2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserKickEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserKickEvent.java @@ -13,7 +13,7 @@ import com.eu.habbo.plugin.events.users.UserKickEvent; public class RoomUserKickEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserMuteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserMuteEvent.java index 1e89a35b..f2e5cc2c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserMuteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserMuteEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.messages.outgoing.users.RemainingMutePeriodComposer; public class RoomUserMuteEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); int roomId = this.packet.readInt(); int minutes = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ShoutEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ShoutEvent.java index 58341211..40c2b46f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ShoutEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/ShoutEvent.java @@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j; public class ShoutEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/SignEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/SignEvent.java index d46a98a1..9e38ba84 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/SignEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/SignEvent.java @@ -10,7 +10,7 @@ import com.eu.habbo.plugin.events.users.UserSignEvent; public class SignEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int signId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); @@ -20,7 +20,7 @@ public class SignEvent extends MessageHandler { UserSignEvent event = new UserSignEvent(this.client.getHabbo(), signId); if (!Emulator.getPluginManager().fireEvent(event).isCancelled()) { - this.client.getHabbo().getRoomUnit().setStatus(RoomUnitStatus.SIGN, event.sign + ""); + this.client.getHabbo().getRoomUnit().setStatus(RoomUnitStatus.SIGN, event.getSign() + ""); this.client.getHabbo().getHabboInfo().getCurrentRoom().unIdle(this.client.getHabbo()); if(signId <= 10) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/StartTypingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/StartTypingEvent.java index f32f6197..deda8e53 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/StartTypingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/StartTypingEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.UserTypingMessageComposer; public class StartTypingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) { return; } diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanUserFromRoomEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanUserFromRoomEvent.java index 9864cff0..3c1560f9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanUserFromRoomEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnbanUserFromRoomEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class UnbanUserFromRoomEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); int roomId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnignoreUserEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnignoreUserEvent.java index dd86a9f0..81c3773b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnignoreUserEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/UnignoreUserEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.rooms.users.IgnoreResultMessageComposer; public class UnignoreUserEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); if (room != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/WhisperEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/WhisperEvent.java index 1875abe7..910faaee 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/WhisperEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/WhisperEvent.java @@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j; public class WhisperEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/AcceptTradingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/AcceptTradingEvent.java index b7800c08..85870b34 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/AcceptTradingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/AcceptTradingEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class AcceptTradingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Habbo habbo = this.client.getHabbo(); if (habbo == null || habbo.getHabboInfo() == null || habbo.getHabboInfo().getCurrentRoom() == null) diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemToTradeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemToTradeEvent.java index 65caf47e..233fdec7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemToTradeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemToTradeEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class AddItemToTradeEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemsToTradeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemsToTradeEvent.java index d11e7a6b..716eff81 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemsToTradeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/AddItemsToTradeEvent.java @@ -7,7 +7,7 @@ import gnu.trove.set.hash.THashSet; public class AddItemsToTradeEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo().getHabboInfo().getCurrentRoom() == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/CloseTradingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/CloseTradingEvent.java index 9eada573..0c064546 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/CloseTradingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/CloseTradingEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class CloseTradingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Habbo habbo = this.client.getHabbo(); Room room = habbo.getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmAcceptTradingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmAcceptTradingEvent.java index 0e26abbb..c75d62bd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmAcceptTradingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmAcceptTradingEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ConfirmAcceptTradingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Habbo habbo = this.client.getHabbo(); RoomTrade trade = habbo.getHabboInfo().getCurrentRoom().getActiveTradeForHabbo(habbo); diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmDeclineTradingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmDeclineTradingEvent.java index 075c22cf..2762db99 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmDeclineTradingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/ConfirmDeclineTradingEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ConfirmDeclineTradingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Habbo habbo = this.client.getHabbo(); Room room = habbo.getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/OpenTradingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/OpenTradingEvent.java index 3772f070..7962d056 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/OpenTradingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/OpenTradingEvent.java @@ -11,7 +11,7 @@ import com.eu.habbo.messages.outgoing.trading.TradingOpenFailedComposer; public class OpenTradingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (Emulator.getIntUnixTimestamp() - this.client.getHabbo().getHabboStats().getLastTradeTimestamp() > 10) { this.client.getHabbo().getHabboStats().setLastTradeTimestamp(Emulator.getIntUnixTimestamp()); int userId = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/RemoveItemFromTradeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/RemoveItemFromTradeEvent.java index 4be70a95..ee8245f1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/RemoveItemFromTradeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/RemoveItemFromTradeEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class RemoveItemFromTradeEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); RoomTrade trade = this.client.getHabbo().getHabboInfo().getCurrentRoom().getActiveTradeForHabbo(this.client.getHabbo()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/trading/UnacceptTradingEvent.java b/src/main/java/com/eu/habbo/messages/incoming/trading/UnacceptTradingEvent.java index 4f8c3acb..ac788b39 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/trading/UnacceptTradingEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/trading/UnacceptTradingEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class UnacceptTradingEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { Habbo habbo = this.client.getHabbo(); RoomTrade trade = habbo.getHabboInfo().getCurrentRoom().getActiveTradeForHabbo(habbo); diff --git a/src/main/java/com/eu/habbo/messages/incoming/unknown/GetResolutionAchievementsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/unknown/GetResolutionAchievementsEvent.java index b342197f..346d3ab0 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/unknown/GetResolutionAchievementsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/unknown/GetResolutionAchievementsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.events.resolution.AchievementResolutionsMe public class GetResolutionAchievementsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); int viewAll = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/unknown/UnknownEvent2.java b/src/main/java/com/eu/habbo/messages/incoming/unknown/UnknownEvent2.java index 417a56c0..ef7354a1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/unknown/UnknownEvent2.java +++ b/src/main/java/com/eu/habbo/messages/incoming/unknown/UnknownEvent2.java @@ -4,6 +4,6 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class UnknownEvent2 extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectActivatedEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectActivatedEvent.java index b02167be..b73780d1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectActivatedEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectActivatedEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class AvatarEffectActivatedEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int effectId = this.packet.readInt(); if (this.client.getHabbo().getInventory().getEffectsComponent().ownsEffect(effectId)) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectSelectedEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectSelectedEvent.java index 9831d9a6..7146433a 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectSelectedEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/AvatarEffectSelectedEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class AvatarEffectSelectedEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int effectId = this.packet.readInt(); if (effectId > 0) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeMottoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeMottoEvent.java index c979d77c..045b411d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeMottoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeMottoEvent.java @@ -8,11 +8,11 @@ import com.eu.habbo.plugin.events.users.UserSavedMottoEvent; public class ChangeMottoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String motto = this.packet.readString(); UserSavedMottoEvent event = new UserSavedMottoEvent(this.client.getHabbo(), this.client.getHabbo().getHabboInfo().getMotto(), motto); Emulator.getPluginManager().fireEvent(event); - motto = event.newMotto; + motto = event.getNewMotto(); if(motto.length() <= Emulator.getConfig().getInt("motto.max_length", 38)) { this.client.getHabbo().getHabboInfo().setMotto(motto); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeUserNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeUserNameEvent.java index 0a4a35b1..b329f8f2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/ChangeUserNameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/ChangeUserNameEvent.java @@ -24,7 +24,7 @@ public class ChangeUserNameEvent extends MessageHandler { public static final List changingUsernames = new ArrayList<>(2); @Override - public void handle() throws Exception { + public void handle() { if (!this.client.getHabbo().getHabboStats().isAllowNameChange()) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/CheckUserNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/CheckUserNameEvent.java index ccc093cd..ca79760b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/CheckUserNameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/CheckUserNameEvent.java @@ -12,7 +12,7 @@ public class CheckUserNameEvent extends MessageHandler { public static String VALID_CHARACTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_-=!?@:,."; @Override - public void handle() throws Exception { + public void handle() { if (!this.client.getHabbo().getHabboStats().isAllowNameChange()) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/EventLogEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/EventLogEvent.java index 3add342b..a6e32cb1 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/EventLogEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/EventLogEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class EventLogEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String type = this.packet.readString(); String value = this.packet.readString(); String action = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/GetExtendedProfileEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetExtendedProfileEvent.java index 715d04af..9203d35c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/GetExtendedProfileEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetExtendedProfileEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.users.ExtendedProfileMessageComposer; public class GetExtendedProfileEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int habboId = this.packet.readInt(); Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(habboId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/GetIgnoredUsersEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetIgnoredUsersEvent.java index b1b5d6f7..a3bc41b3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/GetIgnoredUsersEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetIgnoredUsersEvent.java @@ -7,14 +7,16 @@ import com.eu.habbo.habbohotel.users.HabboManager; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.unknown.IgnoredUsersMessageComposer; import gnu.trove.list.array.TIntArrayList; +import lombok.Getter; import java.util.ArrayList; +@Getter public class GetIgnoredUsersEvent extends MessageHandler { - ArrayList ignoredUsernames = new ArrayList<>(); + private final ArrayList ignoredUsernames = new ArrayList<>(); @Override - public void handle() throws Exception { + public void handle() { Habbo habbo = this.client.getHabbo(); if(habbo == null) return; diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/GetRelationshipStatusInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetRelationshipStatusInfoEvent.java index 1cf6f32e..b54198a9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/GetRelationshipStatusInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetRelationshipStatusInfoEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.users.RelationshipStatusInfoComposer; public class GetRelationshipStatusInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/GetSelectedBadgesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetSelectedBadgesEvent.java index 1c4f370f..5ef62718 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/GetSelectedBadgesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetSelectedBadgesEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.users.UserBadgesComposer; public class GetSelectedBadgesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int userId = this.packet.readInt(); Habbo habbo = Emulator.getGameServer().getGameClientManager().getHabbo(userId); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/GetSoundSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetSoundSettingsEvent.java index f16f9af9..8fc7b2e0 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/GetSoundSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetSoundSettingsEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.users.AccountPreferencesComposer; public class GetSoundSettingsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new AccountPreferencesComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/GetTalentTrackLevelEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetTalentTrackLevelEvent.java index 2534e71c..1d63b3ac 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/GetTalentTrackLevelEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetTalentTrackLevelEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.users.TalentTrackLevelMessageEvent; public class GetTalentTrackLevelEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new TalentTrackLevelMessageEvent(this.packet.readString())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/GetWardrobeEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/GetWardrobeEvent.java index 8802acce..7e0f0a9c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/GetWardrobeEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/GetWardrobeEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.users.WardrobeMessageComposer; public class GetWardrobeEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(new WardrobeMessageComposer(this.client.getHabbo().getInventory().getWardrobeComponent())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/InfoRetrieveEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/InfoRetrieveEvent.java index 606e6ef5..19a6e197 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/InfoRetrieveEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/InfoRetrieveEvent.java @@ -15,7 +15,7 @@ public class InfoRetrieveEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { if (this.client.getHabbo() != null) { //this.client.sendResponse(new TestComposer()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceGetGiftsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceGetGiftsEvent.java index 08844c00..47cd6796 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceGetGiftsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceGetGiftsEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.plugin.events.users.UserPickGiftEvent; public class NewUserExperienceGetGiftsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int totalItems = this.packet.readInt(); //total items int keyA = this.packet.readInt(); //key 1 int keyB = this.packet.readInt(); //key 2 diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceScriptProceedEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceScriptProceedEvent.java index 8761b713..1a9e95a3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceScriptProceedEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/NewUserExperienceScriptProceedEvent.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; public class NewUserExperienceScriptProceedEvent extends MessageHandler { - public static Map keys = new HashMap<>() { + public static final Map keys = new HashMap<>() { { this.put(1, "BOTTOM_BAR_RECEPTION"); this.put(2, "BOTTOM_BAR_NAVIGATOR"); @@ -40,7 +40,7 @@ public class NewUserExperienceScriptProceedEvent extends MessageHandler { } @Override - public void handle() throws Exception { + public void handle() { handle(this.client.getHabbo()); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeOutfitEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeOutfitEvent.java index 0f0c84c0..8ae689bc 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeOutfitEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/SaveWardrobeOutfitEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.plugin.events.users.UserSavedWardrobeEvent; public class SaveWardrobeOutfitEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int slotId = this.packet.readInt(); String look = this.packet.readString(); String gender = this.packet.readString(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetKickbackInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetKickbackInfoEvent.java index 82e4b78f..22e4627e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetKickbackInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetKickbackInfoEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class ScrGetKickbackInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.sendResponse(SubscriptionHabboClub.calculatePayday(this.client.getHabbo().getHabboInfo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetUserInfoEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetUserInfoEvent.java index c05c4ad1..dc9c340d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetUserInfoEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/ScrGetUserInfoEvent.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.users.ScrSendUserInfoComposer; public class ScrGetUserInfoEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String subscriptionType = this.packet.readString(); this.client.sendResponse(new ScrSendUserInfoComposer(this.client.getHabbo(), subscriptionType)); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SetActivatedBadgesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetActivatedBadgesEvent.java index f3f2fc95..c7509697 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/SetActivatedBadgesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetActivatedBadgesEvent.java @@ -10,7 +10,7 @@ import java.util.ArrayList; public class SetActivatedBadgesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { BadgesComponent.resetSlots(this.client.getHabbo()); ArrayList updatedBadges = new ArrayList<>(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SetChatPreferencesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetChatPreferencesEvent.java index e796b26a..c4a7bbb2 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/SetChatPreferencesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetChatPreferencesEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.plugin.events.users.UserSavedSettingsEvent; public class SetChatPreferencesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.getHabbo().getHabboStats().setPreferOldChat(this.packet.readBoolean()); Emulator.getPluginManager().fireEvent(new UserSavedSettingsEvent(this.client.getHabbo())); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SetChatStylePreferenceEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetChatStylePreferenceEvent.java index af668572..9c7fb4f3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/SetChatStylePreferenceEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetChatStylePreferenceEvent.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class SetChatStylePreferenceEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int chatBubble = this.packet.readInt(); if (!this.client.getHabbo().hasPermission(Permission.ACC_ANYCHATCOLOR)) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SetIgnoreRoomInvitesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetIgnoreRoomInvitesEvent.java index e3f02753..6ebae0a9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/SetIgnoreRoomInvitesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetIgnoreRoomInvitesEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.plugin.events.users.UserSavedSettingsEvent; public class SetIgnoreRoomInvitesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.getHabbo().getHabboStats().setBlockRoomInvites(this.packet.readBoolean()); Emulator.getPluginManager().fireEvent(new UserSavedSettingsEvent(this.client.getHabbo())); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SetRoomCameraPreferencesEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetRoomCameraPreferencesEvent.java index 34e98531..941dc6cf 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/SetRoomCameraPreferencesEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetRoomCameraPreferencesEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.plugin.events.users.UserSavedSettingsEvent; public class SetRoomCameraPreferencesEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { this.client.getHabbo().getHabboStats().setBlockCameraFollow(this.packet.readBoolean()); Emulator.getPluginManager().fireEvent(new UserSavedSettingsEvent(this.client.getHabbo())); } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/SetSoundSettingsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/SetSoundSettingsEvent.java index e3aa16d3..a817baa9 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/SetSoundSettingsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/SetSoundSettingsEvent.java @@ -6,7 +6,7 @@ import com.eu.habbo.plugin.events.users.UserSavedSettingsEvent; public class SetSoundSettingsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int system = this.packet.readInt(); int furni = this.packet.readInt(); int trax = this.packet.readInt(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/UpdateFigureDataEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/UpdateFigureDataEvent.java index c6701b97..d2e1b78d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/UpdateFigureDataEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/UpdateFigureDataEvent.java @@ -15,7 +15,7 @@ import lombok.extern.slf4j.Slf4j; public class UpdateFigureDataEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { String genderCode = this.packet.readString(); HabboGender gender; @@ -35,8 +35,8 @@ public class UpdateFigureDataEvent extends MessageHandler { if (lookEvent.isCancelled()) return; - this.client.getHabbo().getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_CHANGE_LOOKS ? ClothingValidationManager.validateLook(this.client.getHabbo(), lookEvent.newLook, lookEvent.gender.name()) : lookEvent.newLook); - this.client.getHabbo().getHabboInfo().setGender(lookEvent.gender); + this.client.getHabbo().getHabboInfo().setLook(ClothingValidationManager.VALIDATE_ON_CHANGE_LOOKS ? ClothingValidationManager.validateLook(this.client.getHabbo(), lookEvent.getNewLook(), lookEvent.getGender().name()) : lookEvent.getNewLook()); + this.client.getHabbo().getHabboInfo().setGender(lookEvent.getGender()); Emulator.getThreading().run(this.client.getHabbo().getHabboInfo()); this.client.sendResponse(new FigureUpdateComposer(this.client.getHabbo())); if (this.client.getHabbo().getHabboInfo().getCurrentRoom() != null) { diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/UpdateUIFlagsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/UpdateUIFlagsEvent.java index 2fecafd0..73962a36 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/UpdateUIFlagsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/UpdateUIFlagsEvent.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; public class UpdateUIFlagsEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int flags = this.packet.readInt(); this.client.getHabbo().getHabboStats().setUiFlags(flags); diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/ApplySnapshotEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/ApplySnapshotEvent.java index 55e0c3a9..c52491cd 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/wired/ApplySnapshotEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/wired/ApplySnapshotEvent.java @@ -23,7 +23,7 @@ public class ApplySnapshotEvent extends MessageHandler { } @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); // Executing Habbo has to be in a Room diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateActionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateActionEvent.java index a5f34cb4..16a1a31c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateActionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateActionEvent.java @@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.wired.WiredSavedComposer; public class UpdateActionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateConditionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateConditionEvent.java index c4f1b991..7bc5279d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateConditionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateConditionEvent.java @@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.wired.WiredSavedComposer; public class UpdateConditionEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateTriggerEvent.java b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateTriggerEvent.java index fd6b3384..56e6f69e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateTriggerEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/wired/UpdateTriggerEvent.java @@ -12,7 +12,7 @@ import com.eu.habbo.messages.outgoing.wired.WiredSavedComposer; public class UpdateTriggerEvent extends MessageHandler { @Override - public void handle() throws Exception { + public void handle() { int itemId = this.packet.readInt(); Room room = this.client.getHabbo().getHabboInfo().getCurrentRoom(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java index 209c7630..6d826c30 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/UserEventCatsComposer.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; public class UserEventCatsComposer extends MessageComposer { - public static List CATEGORIES = new ArrayList<>(); + public static final List CATEGORIES = new ArrayList<>(); @Override protected ServerMessage composeInternal() { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java index 07581d57..0061c9a6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceStatusMessageComposer.java @@ -10,8 +10,9 @@ import com.eu.habbo.messages.outgoing.Outgoing; import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; -@RequiredArgsConstructor + @AllArgsConstructor +@RequiredArgsConstructor public class RentableSpaceStatusMessageComposer extends MessageComposer { public static final int SPACE_ALREADY_RENTED = 100; public static final int SPACE_EXTEND_NOT_RENTED = 101; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java index 90fa161c..7ef4cc4e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersMessageComposer.java @@ -3,16 +3,16 @@ package com.eu.habbo.messages.outgoing.unknown; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; +import lombok.AllArgsConstructor; +import lombok.Getter; import java.util.ArrayList; +@Getter +@AllArgsConstructor public class IgnoredUsersMessageComposer extends MessageComposer { - ArrayList ignoredUsers; - - public IgnoredUsersMessageComposer(ArrayList ignoredUsers) { - this.ignoredUsers = ignoredUsers; - } + private final ArrayList ignoredUsers; @Override protected ServerMessage composeInternal() { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java index 715ac53d..c60c5e5a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ScrSendUserInfoComposer.java @@ -15,11 +15,11 @@ public class ScrSendUserInfoComposer extends MessageComposer { private final String subscriptionType; private final int responseType; - public static int RESPONSE_TYPE_NORMAL = 0; - public static int RESPONSE_TYPE_LOGIN = 1; - public static int RESPONSE_TYPE_PURCHASE = 2; // closes the catalog after buying - public static int RESPONSE_TYPE_DISCOUNT_AVAILABLE = 3; - public static int RESPONSE_TYPE_CITIZENSHIP_DISCOUNT = 4; + public static final int RESPONSE_TYPE_NORMAL = 0; + public static final int RESPONSE_TYPE_LOGIN = 1; + public static final int RESPONSE_TYPE_PURCHASE = 2; // closes the catalog after buying + public static final int RESPONSE_TYPE_DISCOUNT_AVAILABLE = 3; + public static final int RESPONSE_TYPE_CITIZENSHIP_DISCOUNT = 4; public ScrSendUserInfoComposer(Habbo habbo) { this.habbo = habbo; diff --git a/src/main/java/com/eu/habbo/messages/rcon/CreateModToolTicket.java b/src/main/java/com/eu/habbo/messages/rcon/CreateModToolTicket.java index aa9a033b..23861a5f 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/CreateModToolTicket.java +++ b/src/main/java/com/eu/habbo/messages/rcon/CreateModToolTicket.java @@ -31,7 +31,7 @@ public class CreateModToolTicket extends RCONMessage { public String reported_username; - public int reported_room_id = 0; + public final int reported_room_id = 0; public String message; diff --git a/src/main/java/com/eu/habbo/messages/rcon/DisconnectUser.java b/src/main/java/com/eu/habbo/messages/rcon/DisconnectUser.java index 8b768ac0..35c564c1 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/DisconnectUser.java +++ b/src/main/java/com/eu/habbo/messages/rcon/DisconnectUser.java @@ -35,7 +35,7 @@ public class DisconnectUser extends RCONMessage { static class GiveBadgeJSON { - public int user_id = -1; + public final int user_id = -1; public String badge; diff --git a/src/main/java/com/eu/habbo/networking/camera/CameraIncomingMessage.java b/src/main/java/com/eu/habbo/networking/camera/CameraIncomingMessage.java index 50f18dfe..c66e2e79 100644 --- a/src/main/java/com/eu/habbo/networking/camera/CameraIncomingMessage.java +++ b/src/main/java/com/eu/habbo/networking/camera/CameraIncomingMessage.java @@ -59,5 +59,5 @@ public abstract class CameraIncomingMessage extends CameraMessage { return this.buffer.readableBytes(); } - public abstract void handle(Channel client) throws Exception; + public abstract void handle(Channel client); } diff --git a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraAuthenticationTicketEvent.java b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraAuthenticationTicketEvent.java index 7855a004..9d5358dc 100644 --- a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraAuthenticationTicketEvent.java +++ b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraAuthenticationTicketEvent.java @@ -11,7 +11,7 @@ public class CameraAuthenticationTicketEvent extends CameraIncomingMessage { } @Override - public void handle(Channel client) throws Exception { + public void handle(Channel client) { String ticket = this.readString(); if (ticket.startsWith("FASTFOOD")) { diff --git a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraLoginStatusEvent.java b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraLoginStatusEvent.java index 5ef3dc14..da272c0a 100644 --- a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraLoginStatusEvent.java +++ b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraLoginStatusEvent.java @@ -22,7 +22,7 @@ public class CameraLoginStatusEvent extends CameraIncomingMessage { } @Override - public void handle(Channel client) throws Exception { + public void handle(Channel client) { int status = this.readInt(); if (status == LOGIN_ERROR) { diff --git a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraResultURLEvent.java b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraResultURLEvent.java index 2ee2028d..efc5c351 100644 --- a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraResultURLEvent.java +++ b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraResultURLEvent.java @@ -17,7 +17,7 @@ public class CameraResultURLEvent extends CameraIncomingMessage { } @Override - public void handle(Channel client) throws Exception { + public void handle(Channel client) { int userId = this.readInt(); int status = this.readInt(); String URL = this.readString(); diff --git a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraRoomThumbnailGeneratedEvent.java b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraRoomThumbnailGeneratedEvent.java index 2a0c5aef..b80a0bc9 100644 --- a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraRoomThumbnailGeneratedEvent.java +++ b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraRoomThumbnailGeneratedEvent.java @@ -13,7 +13,7 @@ public class CameraRoomThumbnailGeneratedEvent extends CameraIncomingMessage { } @Override - public void handle(Channel client) throws Exception { + public void handle(Channel client) { int userId = this.readInt(); Habbo habbo = Emulator.getGameEnvironment().getHabboManager().getHabbo(userId); diff --git a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraUpdateNotification.java b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraUpdateNotification.java index aa0b7e4e..481217cd 100644 --- a/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraUpdateNotification.java +++ b/src/main/java/com/eu/habbo/networking/camera/messages/incoming/CameraUpdateNotification.java @@ -15,7 +15,7 @@ public class CameraUpdateNotification extends CameraIncomingMessage { } @Override - public void handle(Channel client) throws Exception { + public void handle(Channel client) { boolean alert = this.readBoolean(); String message = this.readString(); int type = this.readInt(); diff --git a/src/main/java/com/eu/habbo/networking/rconserver/RCONServer.java b/src/main/java/com/eu/habbo/networking/rconserver/RCONServer.java index 6c9bdb40..97738fcc 100644 --- a/src/main/java/com/eu/habbo/networking/rconserver/RCONServer.java +++ b/src/main/java/com/eu/habbo/networking/rconserver/RCONServer.java @@ -9,6 +9,7 @@ import gnu.trove.map.hash.THashMap; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInitializer; import io.netty.channel.socket.SocketChannel; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; @@ -20,9 +21,10 @@ public class RCONServer extends Server { private final THashMap> messages; private final GsonBuilder gsonBuilder; - List allowedAdresses = new ArrayList<>(); + @Getter + private final List allowedAdresses = new ArrayList<>(); - public RCONServer(String host, int port) throws Exception { + public RCONServer(String host, int port) { super("RCON Server", host, port, 1, 2); this.messages = new THashMap<>(); @@ -71,7 +73,7 @@ public class RCONServer extends Server { this.serverBootstrap.childHandler(new ChannelInitializer() { @Override - public void initChannel(SocketChannel ch) throws Exception { + public void initChannel(SocketChannel ch) { ch.pipeline().addLast(new RCONServerHandler()); } }); @@ -82,7 +84,7 @@ public class RCONServer extends Server { this.messages.put(key, clazz); } - public String handle(ChannelHandlerContext ctx, String key, String body) throws Exception { + public String handle(ChannelHandlerContext ctx, String key, String body) { Class message = this.messages.get(key.replace("_", "").toLowerCase()); String result; diff --git a/src/main/java/com/eu/habbo/networking/rconserver/RCONServerHandler.java b/src/main/java/com/eu/habbo/networking/rconserver/RCONServerHandler.java index 116af540..a6f2e1b4 100644 --- a/src/main/java/com/eu/habbo/networking/rconserver/RCONServerHandler.java +++ b/src/main/java/com/eu/habbo/networking/rconserver/RCONServerHandler.java @@ -18,7 +18,7 @@ public class RCONServerHandler extends ChannelInboundHandlerAdapter { public void channelRegistered(ChannelHandlerContext ctx) { String adress = ctx.channel().remoteAddress().toString().split(":")[0].replace("/", ""); - for (String s : Emulator.getRconServer().allowedAdresses) { + for (String s : Emulator.getRconServer().getAllowedAdresses()) { if (s.equalsIgnoreCase(adress)) { return; } diff --git a/src/main/java/com/eu/habbo/plugin/HabboPlugin.java b/src/main/java/com/eu/habbo/plugin/HabboPlugin.java index 56d2da17..5ae671a2 100644 --- a/src/main/java/com/eu/habbo/plugin/HabboPlugin.java +++ b/src/main/java/com/eu/habbo/plugin/HabboPlugin.java @@ -15,9 +15,9 @@ public abstract class HabboPlugin { public URLClassLoader classLoader; public InputStream stream; - public abstract void onEnable() throws Exception; + public abstract void onEnable(); - public abstract void onDisable() throws Exception; + public abstract void onDisable(); public boolean isRegistered(Class clazz) { return this.registeredEvents.containsKey(clazz); diff --git a/src/main/java/com/eu/habbo/plugin/events/bots/BotChatEvent.java b/src/main/java/com/eu/habbo/plugin/events/bots/BotChatEvent.java index 1a5dcd19..26f01e77 100644 --- a/src/main/java/com/eu/habbo/plugin/events/bots/BotChatEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/bots/BotChatEvent.java @@ -1,10 +1,12 @@ package com.eu.habbo.plugin.events.bots; import com.eu.habbo.habbohotel.bots.Bot; +import lombok.Getter; +@Getter public abstract class BotChatEvent extends BotEvent { - public String message; + private final String message; public BotChatEvent(Bot bot, String message) { diff --git a/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedChatEvent.java b/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedChatEvent.java index fa5bbd6f..fdce6258 100644 --- a/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedChatEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedChatEvent.java @@ -1,21 +1,23 @@ package com.eu.habbo.plugin.events.bots; import com.eu.habbo.habbohotel.bots.Bot; +import lombok.Getter; import java.util.ArrayList; +@Getter public class BotSavedChatEvent extends BotEvent { - public boolean autoChat; + private final boolean autoChat; - public boolean randomChat; + private final boolean randomChat; - public int chatDelay; + private final int chatDelay; - public ArrayList chat; + private final ArrayList chat; public BotSavedChatEvent(Bot bot, boolean autoChat, boolean randomChat, int chatDelay, ArrayList chat) { diff --git a/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedLookEvent.java b/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedLookEvent.java index 0f3aba16..69c2a7f0 100644 --- a/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedLookEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedLookEvent.java @@ -2,16 +2,18 @@ package com.eu.habbo.plugin.events.bots; import com.eu.habbo.habbohotel.bots.Bot; import com.eu.habbo.habbohotel.users.HabboGender; +import lombok.Getter; +@Getter public class BotSavedLookEvent extends BotEvent { - public HabboGender gender; + private final HabboGender gender; - public String newLook; + private final String newLook; - public int effect; + private final int effect; public BotSavedLookEvent(Bot bot, HabboGender gender, String newLook, int effect) { diff --git a/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedNameEvent.java b/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedNameEvent.java index 3109166d..63684f52 100644 --- a/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedNameEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/bots/BotSavedNameEvent.java @@ -1,10 +1,12 @@ package com.eu.habbo.plugin.events.bots; import com.eu.habbo.habbohotel.bots.Bot; +import lombok.Getter; +@Getter public class BotSavedNameEvent extends BotEvent { - public String name; + private final String name; public BotSavedNameEvent(Bot bot, String name) { diff --git a/src/main/java/com/eu/habbo/plugin/events/bots/BotServerItemEvent.java b/src/main/java/com/eu/habbo/plugin/events/bots/BotServerItemEvent.java index b9e073ad..340a5037 100644 --- a/src/main/java/com/eu/habbo/plugin/events/bots/BotServerItemEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/bots/BotServerItemEvent.java @@ -2,12 +2,14 @@ package com.eu.habbo.plugin.events.bots; import com.eu.habbo.habbohotel.bots.Bot; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class BotServerItemEvent extends BotEvent { - public Habbo habbo; + private final Habbo habbo; - public int itemId; + private final int itemId; public BotServerItemEvent(Bot bot, Habbo habbo, int itemId) { diff --git a/src/main/java/com/eu/habbo/plugin/events/bots/BotWhisperEvent.java b/src/main/java/com/eu/habbo/plugin/events/bots/BotWhisperEvent.java index 5be8bb46..9f33f395 100644 --- a/src/main/java/com/eu/habbo/plugin/events/bots/BotWhisperEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/bots/BotWhisperEvent.java @@ -2,10 +2,12 @@ package com.eu.habbo.plugin.events.bots; import com.eu.habbo.habbohotel.bots.Bot; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class BotWhisperEvent extends BotChatEvent { - public Habbo target; + private final Habbo target; public BotWhisperEvent(Bot bot, String message, Habbo target) { diff --git a/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureDiceRolledEvent.java b/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureDiceRolledEvent.java index 5bad7182..228a6568 100644 --- a/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureDiceRolledEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureDiceRolledEvent.java @@ -2,10 +2,12 @@ package com.eu.habbo.plugin.events.furniture; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; +import lombok.Getter; +@Getter public class FurnitureDiceRolledEvent extends FurnitureUserEvent { - public int result; + private final int result; public FurnitureDiceRolledEvent(HabboItem furniture, Habbo habbo, int result) { diff --git a/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureRoomTonerEvent.java b/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureRoomTonerEvent.java index 4ee85218..402b16f8 100644 --- a/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureRoomTonerEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureRoomTonerEvent.java @@ -2,11 +2,14 @@ package com.eu.habbo.plugin.events.furniture; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; +import lombok.Getter; + +@Getter public class FurnitureRoomTonerEvent extends FurnitureUserEvent { - public int hue; - public int saturation; - public int brightness; + private final int hue; + private final int saturation; + private final int brightness; public FurnitureRoomTonerEvent(HabboItem furniture, Habbo habbo, int hue, int saturation, int brightness) { diff --git a/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureToggleEvent.java b/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureToggleEvent.java index 01dd9c92..89386461 100644 --- a/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureToggleEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/furniture/FurnitureToggleEvent.java @@ -2,9 +2,11 @@ package com.eu.habbo.plugin.events.furniture; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; +import lombok.Getter; +@Getter public class FurnitureToggleEvent extends FurnitureUserEvent { - public int state; + private final int state; public FurnitureToggleEvent(HabboItem furniture, Habbo habbo, int state) { super(furniture, habbo); diff --git a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedBadgeEvent.java b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedBadgeEvent.java index fac0988a..1ff4decf 100644 --- a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedBadgeEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedBadgeEvent.java @@ -1,10 +1,12 @@ package com.eu.habbo.plugin.events.guilds; import com.eu.habbo.habbohotel.guilds.Guild; +import lombok.Getter; +@Getter public class GuildChangedBadgeEvent extends GuildEvent { - public String badge; + private final String badge; public GuildChangedBadgeEvent(Guild guild, String badge) { diff --git a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedColorsEvent.java b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedColorsEvent.java index 6beb5631..381afaf5 100644 --- a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedColorsEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedColorsEvent.java @@ -1,13 +1,15 @@ package com.eu.habbo.plugin.events.guilds; import com.eu.habbo.habbohotel.guilds.Guild; +import lombok.Getter; +@Getter public class GuildChangedColorsEvent extends GuildEvent { - public int colorOne; + private final int colorOne; - public int colorTwo; + private final int colorTwo; public GuildChangedColorsEvent(Guild guild, int colorOne, int colorTwo) { diff --git a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedNameEvent.java b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedNameEvent.java index 0a52395b..cca73ba2 100644 --- a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedNameEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedNameEvent.java @@ -1,13 +1,15 @@ package com.eu.habbo.plugin.events.guilds; import com.eu.habbo.habbohotel.guilds.Guild; +import lombok.Getter; +@Getter public class GuildChangedNameEvent extends GuildEvent { - public String name; + private final String name; - public String description; + private final String description; public GuildChangedNameEvent(Guild guild, String name, String description) { diff --git a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedSettingsEvent.java b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedSettingsEvent.java index 8c72a076..0dc84ec9 100644 --- a/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedSettingsEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/guilds/GuildChangedSettingsEvent.java @@ -1,12 +1,14 @@ package com.eu.habbo.plugin.events.guilds; import com.eu.habbo.habbohotel.guilds.Guild; +import lombok.Getter; +@Getter public class GuildChangedSettingsEvent extends GuildEvent { - public int state; + private final int state; - public boolean rights; + private final boolean rights; public GuildChangedSettingsEvent(Guild guild, int state, boolean rights) { super(guild); diff --git a/src/main/java/com/eu/habbo/plugin/events/inventory/InventoryItemEvent.java b/src/main/java/com/eu/habbo/plugin/events/inventory/InventoryItemEvent.java index 1b93cf86..3a87ee19 100644 --- a/src/main/java/com/eu/habbo/plugin/events/inventory/InventoryItemEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/inventory/InventoryItemEvent.java @@ -2,9 +2,13 @@ package com.eu.habbo.plugin.events.inventory; import com.eu.habbo.habbohotel.users.HabboInventory; import com.eu.habbo.habbohotel.users.HabboItem; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.experimental.SuperBuilder; +@Getter public class InventoryItemEvent extends InventoryEvent { - public HabboItem item; + private final HabboItem item; public InventoryItemEvent(HabboInventory inventory, HabboItem item) { super(inventory); diff --git a/src/main/java/com/eu/habbo/plugin/events/marketplace/MarketPlaceItemOfferedEvent.java b/src/main/java/com/eu/habbo/plugin/events/marketplace/MarketPlaceItemOfferedEvent.java index fa351db2..100228e4 100644 --- a/src/main/java/com/eu/habbo/plugin/events/marketplace/MarketPlaceItemOfferedEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/marketplace/MarketPlaceItemOfferedEvent.java @@ -2,11 +2,13 @@ package com.eu.habbo.plugin.events.marketplace; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; +import lombok.Getter; +@Getter public class MarketPlaceItemOfferedEvent extends MarketPlaceEvent { - public final Habbo habbo; - public final HabboItem item; - public int price; + private final Habbo habbo; + private final HabboItem item; + private final int price; public MarketPlaceItemOfferedEvent(Habbo habbo, HabboItem item, int price) { this.habbo = habbo; diff --git a/src/main/java/com/eu/habbo/plugin/events/pets/PetTalkEvent.java b/src/main/java/com/eu/habbo/plugin/events/pets/PetTalkEvent.java index 8fefd42e..87b40825 100644 --- a/src/main/java/com/eu/habbo/plugin/events/pets/PetTalkEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/pets/PetTalkEvent.java @@ -2,10 +2,12 @@ package com.eu.habbo.plugin.events.pets; import com.eu.habbo.habbohotel.pets.Pet; import com.eu.habbo.habbohotel.rooms.RoomChatMessage; +import lombok.Getter; +@Getter public class PetTalkEvent extends PetEvent { - public RoomChatMessage message; + private final RoomChatMessage message; public PetTalkEvent(Pet pet, RoomChatMessage message) { super(pet); diff --git a/src/main/java/com/eu/habbo/plugin/events/sanctions/SanctionEvent.java b/src/main/java/com/eu/habbo/plugin/events/sanctions/SanctionEvent.java index 1a73c4f0..7580a80a 100644 --- a/src/main/java/com/eu/habbo/plugin/events/sanctions/SanctionEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/sanctions/SanctionEvent.java @@ -2,11 +2,13 @@ package com.eu.habbo.plugin.events.sanctions; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.plugin.events.support.SupportEvent; +import lombok.Getter; +@Getter public class SanctionEvent extends SupportEvent { - public Habbo target; + private final Habbo target; - public int sanctionLevel; + private final int sanctionLevel; public SanctionEvent(Habbo moderator, Habbo target, int sanctionLevel) { super(moderator); diff --git a/src/main/java/com/eu/habbo/plugin/events/support/SupportEvent.java b/src/main/java/com/eu/habbo/plugin/events/support/SupportEvent.java index b198ecd8..e4bed40d 100644 --- a/src/main/java/com/eu/habbo/plugin/events/support/SupportEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/support/SupportEvent.java @@ -2,13 +2,11 @@ package com.eu.habbo.plugin.events.support; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.plugin.Event; +import lombok.AllArgsConstructor; +import lombok.Getter; +@Getter +@AllArgsConstructor public abstract class SupportEvent extends Event { - - public Habbo moderator; - - - public SupportEvent(Habbo moderator) { - this.moderator = moderator; - } + protected final Habbo moderator; } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/plugin/events/support/SupportRoomActionEvent.java b/src/main/java/com/eu/habbo/plugin/events/support/SupportRoomActionEvent.java index f05df35b..48702992 100644 --- a/src/main/java/com/eu/habbo/plugin/events/support/SupportRoomActionEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/support/SupportRoomActionEvent.java @@ -2,19 +2,15 @@ package com.eu.habbo.plugin.events.support; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class SupportRoomActionEvent extends SupportEvent { - public final Room room; - - - public boolean kickUsers; - - - public boolean lockDoor; - - - public boolean changeTitle; + private final Room room; + private final boolean kickUsers; + private final boolean lockDoor; + private final boolean changeTitle; public SupportRoomActionEvent(Habbo moderator, Room room, boolean kickUsers, boolean lockDoor, boolean changeTitle) { diff --git a/src/main/java/com/eu/habbo/plugin/events/support/SupportUserAlertedEvent.java b/src/main/java/com/eu/habbo/plugin/events/support/SupportUserAlertedEvent.java index de3dc547..e5806d61 100644 --- a/src/main/java/com/eu/habbo/plugin/events/support/SupportUserAlertedEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/support/SupportUserAlertedEvent.java @@ -1,14 +1,16 @@ package com.eu.habbo.plugin.events.support; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class SupportUserAlertedEvent extends SupportEvent { - public Habbo target; + private final Habbo target; - public String message; + private final String message; - public SupportUserAlertedReason reason; + private final SupportUserAlertedReason reason; public SupportUserAlertedEvent(Habbo moderator, Habbo target, String message, SupportUserAlertedReason reason) { super(moderator); diff --git a/src/main/java/com/eu/habbo/plugin/events/support/SupportUserKickEvent.java b/src/main/java/com/eu/habbo/plugin/events/support/SupportUserKickEvent.java index 9a28a94a..baab738a 100644 --- a/src/main/java/com/eu/habbo/plugin/events/support/SupportUserKickEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/support/SupportUserKickEvent.java @@ -1,13 +1,13 @@ package com.eu.habbo.plugin.events.support; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class SupportUserKickEvent extends SupportEvent { - public Habbo target; - - - public String message; + private final Habbo target; + private final String message; public SupportUserKickEvent(Habbo moderator, Habbo target, String message) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/HabboAddedToRoomEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/HabboAddedToRoomEvent.java index 8753b8bf..607028e3 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/HabboAddedToRoomEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/HabboAddedToRoomEvent.java @@ -2,14 +2,16 @@ package com.eu.habbo.plugin.events.users; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; import java.util.Collection; +@Getter public class HabboAddedToRoomEvent extends UserEvent { - public final Room room; - public Collection habbosToSendEnter; - public Collection visibleHabbos; + private final Room room; + private final Collection habbosToSendEnter; + private final Collection visibleHabbos; public HabboAddedToRoomEvent(Habbo habbo, Room room, Collection habbosToSendEnter, Collection visibleHabbos) { super(habbo); diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserCreditsEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/UserCreditsEvent.java index 0186e98f..28ebd7a1 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/UserCreditsEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/UserCreditsEvent.java @@ -1,10 +1,12 @@ package com.eu.habbo.plugin.events.users; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class UserCreditsEvent extends UserEvent { - public int credits; + private final int credits; public UserCreditsEvent(Habbo habbo, int credits) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserIdleEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/UserIdleEvent.java index 5e5b7782..40240a21 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/UserIdleEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/UserIdleEvent.java @@ -1,10 +1,12 @@ package com.eu.habbo.plugin.events.users; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class UserIdleEvent extends UserEvent { - public final IdleReason reason; - public boolean idle; + private final IdleReason reason; + private final boolean idle; public UserIdleEvent(Habbo habbo, IdleReason reason, boolean idle) { super(habbo); diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserPointsEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/UserPointsEvent.java index d014e419..f1811774 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/UserPointsEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/UserPointsEvent.java @@ -1,13 +1,12 @@ package com.eu.habbo.plugin.events.users; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class UserPointsEvent extends UserEvent { - - public int points; - - - public int type; + private final int points; + private final int type; public UserPointsEvent(Habbo habbo, int points, int type) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserPublishPictureEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/UserPublishPictureEvent.java index 7c794fb3..a538bec2 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/UserPublishPictureEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/UserPublishPictureEvent.java @@ -1,16 +1,15 @@ package com.eu.habbo.plugin.events.users; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class UserPublishPictureEvent extends UserEvent { + private final String URL; - public String URL; + private final int timestamp; - - public int timestamp; - - - public int roomId; + private final int roomId; public UserPublishPictureEvent(Habbo habbo, String url, int timestamp, int roomId) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserPurchasePictureEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/UserPurchasePictureEvent.java index b79fbb2a..a593baf2 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/UserPurchasePictureEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/UserPurchasePictureEvent.java @@ -1,16 +1,13 @@ package com.eu.habbo.plugin.events.users; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class UserPurchasePictureEvent extends UserEvent { - - public String url; - - - public int roomId; - - - public int timestamp; + private final String url; + private final int roomId; + private final int timestamp; public UserPurchasePictureEvent(Habbo habbo, String url, int roomId, int timestamp) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserSavedLookEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/UserSavedLookEvent.java index 096cbe3a..cd7e0ddb 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/UserSavedLookEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/UserSavedLookEvent.java @@ -2,10 +2,12 @@ package com.eu.habbo.plugin.events.users; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboGender; +import lombok.Getter; +@Getter public class UserSavedLookEvent extends UserEvent { - public HabboGender gender; - public String newLook; + private final HabboGender gender; + private final String newLook; public UserSavedLookEvent(Habbo habbo, HabboGender gender, String newLook) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserSavedMottoEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/UserSavedMottoEvent.java index 0b64b449..35374600 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/UserSavedMottoEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/UserSavedMottoEvent.java @@ -1,10 +1,12 @@ package com.eu.habbo.plugin.events.users; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class UserSavedMottoEvent extends UserEvent { - public final String oldMotto; - public String newMotto; + private final String oldMotto; + private final String newMotto; public UserSavedMottoEvent(Habbo habbo, String oldMotto, String newMotto) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserSignEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/UserSignEvent.java index 04899467..e9669d07 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/UserSignEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/UserSignEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.plugin.events.users; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class UserSignEvent extends UserEvent { - - - public int sign; + private final int sign; public UserSignEvent(Habbo habbo, int sign) { super(habbo); diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserWiredRewardReceived.java b/src/main/java/com/eu/habbo/plugin/events/users/UserWiredRewardReceived.java deleted file mode 100644 index c2c16e30..00000000 --- a/src/main/java/com/eu/habbo/plugin/events/users/UserWiredRewardReceived.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.eu.habbo.plugin.events.users; - -import com.eu.habbo.habbohotel.items.interactions.wired.effects.WiredEffectGiveReward; -import com.eu.habbo.habbohotel.users.Habbo; - -public class UserWiredRewardReceived extends UserEvent { - - public final WiredEffectGiveReward wiredEffectGiveReward; - - - public final String type; - - - public String value; - - - public UserWiredRewardReceived(Habbo habbo, WiredEffectGiveReward wiredEffectGiveReward, String type, String value) { - super(habbo); - - this.wiredEffectGiveReward = wiredEffectGiveReward; - this.type = type; - this.value = value; - } -} diff --git a/src/main/java/com/eu/habbo/plugin/events/users/UserWiredRewardReceivedEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/UserWiredRewardReceivedEvent.java new file mode 100644 index 00000000..cc92f971 --- /dev/null +++ b/src/main/java/com/eu/habbo/plugin/events/users/UserWiredRewardReceivedEvent.java @@ -0,0 +1,21 @@ +package com.eu.habbo.plugin.events.users; + +import com.eu.habbo.habbohotel.items.interactions.wired.effects.WiredEffectGiveReward; +import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; + +@Getter +public class UserWiredRewardReceivedEvent extends UserEvent { + private final WiredEffectGiveReward wiredEffectGiveReward; + private final String type; + private final String value; + + + public UserWiredRewardReceivedEvent(Habbo habbo, WiredEffectGiveReward wiredEffectGiveReward, String type, String value) { + super(habbo); + + this.wiredEffectGiveReward = wiredEffectGiveReward; + this.type = type; + this.value = value; + } +} diff --git a/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java index e63e8383..92743fe0 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java @@ -4,13 +4,15 @@ import com.eu.habbo.habbohotel.campaign.CalendarCampaign; import com.eu.habbo.habbohotel.campaign.CalendarRewardObject; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.plugin.events.users.UserEvent; +import lombok.Getter; +@Getter public class UserClaimRewardEvent extends UserEvent { - public CalendarCampaign campaign; - public int day; - public CalendarRewardObject reward; - public boolean force; + private final CalendarCampaign campaign; + private final int day; + private final CalendarRewardObject reward; + private final boolean force; public UserClaimRewardEvent(Habbo habbo, CalendarCampaign campaign, int day, CalendarRewardObject reward, boolean force) { super(habbo); diff --git a/src/main/java/com/eu/habbo/plugin/events/users/catalog/UserCatalogEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/catalog/UserCatalogEvent.java index 6fe222af..17eb0a64 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/catalog/UserCatalogEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/catalog/UserCatalogEvent.java @@ -3,10 +3,12 @@ package com.eu.habbo.plugin.events.users.catalog; import com.eu.habbo.habbohotel.catalog.CatalogItem; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.plugin.events.users.UserEvent; +import lombok.Getter; +@Getter public class UserCatalogEvent extends UserEvent { - public CatalogItem catalogItem; + private final CatalogItem catalogItem; public UserCatalogEvent(Habbo habbo, CatalogItem catalogItem) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/catalog/UserCatalogItemPurchasedEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/catalog/UserCatalogItemPurchasedEvent.java index d95bc226..6875591b 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/catalog/UserCatalogItemPurchasedEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/catalog/UserCatalogItemPurchasedEvent.java @@ -4,21 +4,17 @@ import com.eu.habbo.habbohotel.catalog.CatalogItem; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; import gnu.trove.set.hash.THashSet; +import lombok.Getter; import java.util.List; +@Getter public class UserCatalogItemPurchasedEvent extends UserCatalogEvent { public final THashSet itemsList; - - - public int totalCredits; - - - public int totalPoints; - - - public List badges; + private final int totalCredits; + private final int totalPoints; + private final List badges; public UserCatalogItemPurchasedEvent(Habbo habbo, CatalogItem catalogItem, THashSet itemsList, int totalCredits, int totalPoints, List badges) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/friends/UserFriendChatEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/friends/UserFriendChatEvent.java index 144ef541..0a3ed5b0 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/friends/UserFriendChatEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/friends/UserFriendChatEvent.java @@ -2,10 +2,12 @@ package com.eu.habbo.plugin.events.users.friends; import com.eu.habbo.habbohotel.messenger.MessengerBuddy; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class UserFriendChatEvent extends UserFriendEvent { - public String message; + private final String message; public UserFriendChatEvent(Habbo habbo, MessengerBuddy friend, String message) { diff --git a/src/main/java/com/eu/habbo/plugin/events/users/friends/UserRelationShipEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/friends/UserRelationShipEvent.java index 416c58a8..69c12bfb 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/friends/UserRelationShipEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/friends/UserRelationShipEvent.java @@ -2,9 +2,11 @@ package com.eu.habbo.plugin.events.users.friends; import com.eu.habbo.habbohotel.messenger.MessengerBuddy; import com.eu.habbo.habbohotel.users.Habbo; +import lombok.Getter; +@Getter public class UserRelationShipEvent extends UserFriendEvent { - public int relationShip; + private final int relationShip; public UserRelationShipEvent(Habbo habbo, MessengerBuddy friend, int relationShip) { diff --git a/src/main/java/com/eu/habbo/threading/runnables/YouAreAPirate.java b/src/main/java/com/eu/habbo/threading/runnables/YouAreAPirate.java index b500ffb4..c1787a10 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/YouAreAPirate.java +++ b/src/main/java/com/eu/habbo/threading/runnables/YouAreAPirate.java @@ -8,7 +8,7 @@ import com.eu.habbo.habbohotel.rooms.RoomChatType; import com.eu.habbo.habbohotel.users.Habbo; public class YouAreAPirate implements Runnable { - public static String[] iamapirate = new String[]{ + public static final String[] iamapirate = new String[]{ "Do what you want, 'cause a pirate is free,", "You are a pirate!", "",