From f9d81ea19833eaa3d582ac7b7eeeabbb980eb54a Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Sat, 9 May 2020 21:29:49 +0200 Subject: [PATCH 1/9] Fix reference counting and repeated composer() calls. --- .../eu/habbo/core/RoomUserPetComposer.java | 2 +- .../eu/habbo/habbohotel/bots/BotManager.java | 1 - .../habbohotel/gameclients/GameClient.java | 9 +- .../gameclients/GameClientManager.java | 1 - .../items/interactions/InteractionFXBox.java | 1 - .../interactions/InteractionMultiHeight.java | 1 - .../interactions/InteractionPuzzleBox.java | 3 - .../InteractionVendingMachine.java | 2 - .../habbohotel/modtool/ModToolManager.java | 1 - .../com/eu/habbo/messages/ServerMessage.java | 90 ++++++++++++------- .../messages/ServerMessageException.java | 20 +++++ .../guilds/GuildRemoveFavoriteEvent.java | 1 - .../handshake/IsFirstLoginOfDayComposer.java | 2 +- .../incoming/handshake/UnknownComposer5.java | 2 +- .../youtube/YoutubeRequestStateChange.java | 1 - .../rooms/users/RoomUserLookAtPoint.java | 2 - .../messages/outgoing/MessageComposer.java | 14 ++- .../achievements/AchievementListComposer.java | 2 +- .../AchievementProgressComposer.java | 2 +- .../AchievementUnlockedComposer.java | 2 +- .../TalentLevelUpdateComposer.java | 2 +- .../talenttrack/TalentTrackComposer.java | 2 +- .../CameraCompetitionStatusComposer.java | 2 +- .../outgoing/camera/CameraPriceComposer.java | 2 +- .../CameraPublishWaitMessageComposer.java | 2 +- .../CameraPurchaseSuccesfullComposer.java | 2 +- .../CameraRoomThumbnailSavedComposer.java | 2 +- .../outgoing/camera/CameraURLComposer.java | 2 +- .../catalog/AlertLimitedSoldOutComposer.java | 2 +- .../catalog/AlertPurchaseFailedComposer.java | 2 +- .../AlertPurchaseUnavailableComposer.java | 2 +- .../outgoing/catalog/CatalogModeComposer.java | 2 +- .../outgoing/catalog/CatalogPageComposer.java | 2 +- .../catalog/CatalogPagesListComposer.java | 2 +- .../catalog/CatalogSearchResultComposer.java | 2 +- .../catalog/CatalogUpdatedComposer.java | 2 +- .../catalog/ClubCenterDataComposer.java | 2 +- .../outgoing/catalog/ClubDataComposer.java | 2 +- .../outgoing/catalog/ClubGiftsComposer.java | 2 +- .../outgoing/catalog/DiscountComposer.java | 2 +- .../catalog/GiftConfigurationComposer.java | 2 +- .../catalog/GiftReceiverNotFoundComposer.java | 2 +- .../catalog/NotEnoughPointsTypeComposer.java | 2 +- .../PetBoughtNotificationComposer.java | 2 +- .../outgoing/catalog/PetBreedsComposer.java | 2 +- .../catalog/PetNameErrorComposer.java | 2 +- .../outgoing/catalog/PurchaseOKComposer.java | 2 +- .../catalog/RecyclerCompleteComposer.java | 2 +- .../catalog/RecyclerLogicComposer.java | 2 +- .../catalog/RedeemVoucherErrorComposer.java | 2 +- .../catalog/RedeemVoucherOKComposer.java | 2 +- .../catalog/ReloadRecyclerComposer.java | 2 +- .../catalog/TargetedOfferComposer.java | 2 +- .../MarketplaceBuyErrorComposer.java | 2 +- .../MarketplaceCancelSaleComposer.java | 2 +- .../MarketplaceConfigComposer.java | 2 +- .../MarketplaceItemInfoComposer.java | 2 +- .../MarketplaceItemPostedComposer.java | 2 +- .../MarketplaceOffersComposer.java | 2 +- .../MarketplaceOwnItemsComposer.java | 2 +- .../MarketplaceSellItemComposer.java | 2 +- .../crafting/CraftableProductsComposer.java | 2 +- .../crafting/CraftingRecipeComposer.java | 2 +- .../CraftingRecipesAvailableComposer.java | 2 +- .../crafting/CraftingResultComposer.java | 2 +- .../calendar/AdventCalendarDataComposer.java | 2 +- .../AdventCalendarProductComposer.java | 2 +- .../mysticbox/MysticBoxCloseComposer.java | 2 +- .../mysticbox/MysticBoxPrizeComposer.java | 2 +- .../mysticbox/MysticBoxStartOpenComposer.java | 2 +- .../NewYearResolutionCompletedComposer.java | 2 +- .../resolution/NewYearResolutionComposer.java | 2 +- .../NewYearResolutionProgressComposer.java | 2 +- .../FloorPlanEditorBlockedTilesComposer.java | 2 +- .../FloorPlanEditorDoorSettingsComposer.java | 2 +- .../friends/FriendChatMessageComposer.java | 2 +- .../friends/FriendFindingRoomComposer.java | 2 +- .../friends/FriendNotificationComposer.java | 2 +- .../friends/FriendRequestComposer.java | 2 +- .../friends/FriendRequestErrorComposer.java | 2 +- .../outgoing/friends/FriendsComposer.java | 2 +- .../friends/LoadFriendRequestsComposer.java | 2 +- .../friends/MessengerInitComposer.java | 2 +- .../friends/RemoveFriendComposer.java | 2 +- .../outgoing/friends/RoomInviteComposer.java | 2 +- .../friends/RoomInviteErrorComposer.java | 2 +- .../outgoing/friends/StalkErrorComposer.java | 2 +- .../friends/UpdateFriendComposer.java | 2 +- .../friends/UserSearchResultComposer.java | 2 +- .../GameCenterAccountInfoComposer.java | 2 +- ...nterAchievementsConfigurationComposer.java | 2 +- .../gamecenter/GameCenterGameComposer.java | 2 +- .../GameCenterGameListComposer.java | 2 +- .../basejump/BaseJumpJoinQueueComposer.java | 2 +- .../basejump/BaseJumpLeaveQueueComposer.java | 2 +- .../basejump/BaseJumpLoadGameComposer.java | 2 +- .../basejump/BaseJumpLoadGameURLComposer.java | 2 +- .../basejump/BaseJumpUnloadGameComposer.java | 2 +- .../generic/MinimailCountComposer.java | 2 +- ...ckMonthlyClubGiftNotificationComposer.java | 2 +- .../generic/alerts/BotErrorComposer.java | 2 +- .../generic/alerts/BubbleAlertComposer.java | 2 +- .../alerts/CustomNotificationComposer.java | 2 +- .../generic/alerts/GenericAlertComposer.java | 2 +- .../alerts/GenericErrorMessagesComposer.java | 2 +- .../alerts/HotelClosedAndOpensComposer.java | 2 +- .../HotelClosesAndWillOpenAtComposer.java | 2 +- ...elWillCloseInMinutesAndBackInComposer.java | 2 +- .../HotelWillCloseInMinutesComposer.java | 2 +- .../alerts/MessagesForYouComposer.java | 2 +- .../generic/alerts/PetErrorComposer.java | 2 +- .../StaffAlertAndOpenHabboWayComposer.java | 2 +- ...fAlertWIthLinkAndOpenHabboWayComposer.java | 2 +- .../alerts/StaffAlertWithLinkComposer.java | 2 +- .../generic/alerts/UpdateFailedComposer.java | 2 +- .../outgoing/generic/testcomposer.java | 2 +- .../GuardianNewReportReceivedComposer.java | 2 +- .../GuardianVotingRequestedComposer.java | 2 +- .../GuardianVotingResultComposer.java | 2 +- .../guardians/GuardianVotingTimeEnded.java | 2 +- .../GuardianVotingVotesComposer.java | 2 +- .../guides/BullyReportClosedComposer.java | 2 +- .../guides/GuideSessionAttachedComposer.java | 2 +- .../guides/GuideSessionDetachedComposer.java | 2 +- .../guides/GuideSessionEndedComposer.java | 2 +- .../guides/GuideSessionErrorComposer.java | 2 +- ...uideSessionInvitedToGuideRoomComposer.java | 2 +- .../guides/GuideSessionMessageComposer.java | 2 +- .../GuideSessionPartnerIsPlayingComposer.java | 2 +- .../GuideSessionPartnerIsTypingComposer.java | 2 +- .../GuideSessionRequesterRoomComposer.java | 2 +- .../guides/GuideSessionStartedComposer.java | 2 +- .../outgoing/guides/GuideToolsComposer.java | 2 +- .../GuildAcceptMemberErrorComposer.java | 2 +- .../outgoing/guilds/GuildBoughtComposer.java | 2 +- .../guilds/GuildBuyRoomsComposer.java | 2 +- .../GuildConfirmRemoveMemberComposer.java | 2 +- .../guilds/GuildEditFailComposer.java | 2 +- .../GuildFavoriteRoomUserUpdateComposer.java | 2 +- .../guilds/GuildFurniWidgetComposer.java | 2 +- .../outgoing/guilds/GuildInfoComposer.java | 2 +- .../guilds/GuildJoinErrorComposer.java | 2 +- .../outgoing/guilds/GuildListComposer.java | 2 +- .../outgoing/guilds/GuildManageComposer.java | 2 +- .../guilds/GuildMemberUpdateComposer.java | 2 +- .../outgoing/guilds/GuildMembersComposer.java | 2 +- .../outgoing/guilds/GuildPartsComposer.java | 2 +- .../GuildRefreshMembersListComposer.java | 2 +- .../guilds/RemoveGuildFromRoomComposer.java | 2 +- .../forums/GuildForumAddCommentComposer.java | 2 +- .../forums/GuildForumCommentsComposer.java | 2 +- .../guilds/forums/GuildForumDataComposer.java | 2 +- .../guilds/forums/GuildForumListComposer.java | 2 +- .../GuildForumThreadMessagesComposer.java | 2 +- .../forums/GuildForumThreadsComposer.java | 2 +- ...uildForumsUnreadMessagesCountComposer.java | 2 +- .../forums/PostUpdateMessageComposer.java | 2 +- .../forums/ThreadUpdatedMessageComposer.java | 2 +- .../habboway/HabboWayQuizComposer1.java | 2 +- .../habboway/HabboWayQuizComposer2.java | 2 +- .../habboway/nux/NewUserGiftComposer.java | 2 +- .../habboway/nux/NewUserIdentityComposer.java | 2 +- .../habboway/nux/NuxAlertComposer.java | 2 +- .../CompleteDiffieHandshakeComposer.java | 2 +- .../handshake/ConnectionErrorComposer.java | 2 +- .../handshake/DebugConsoleComposer.java | 2 +- .../InitDiffieHandshakeComposer.java | 2 +- .../outgoing/handshake/MachineIDComposer.java | 2 +- .../outgoing/handshake/PongComposer.java | 2 +- .../handshake/SecureLoginOKComposer.java | 2 +- .../handshake/SessionRightsComposer.java | 2 +- .../handshake/SomeConnectionComposer.java | 2 +- .../outgoing/hotelview/BonusRareComposer.java | 2 +- .../hotelview/HallOfFameComposer.java | 2 +- .../HotelViewBadgeButtonConfigComposer.java | 2 +- .../HotelViewCatalogPageExpiringComposer.java | 2 +- .../HotelViewCommunityGoalComposer.java | 2 +- .../outgoing/hotelview/HotelViewComposer.java | 2 +- .../HotelViewConcurrentUsersComposer.java | 2 +- .../HotelViewCustomTimerComposer.java | 2 +- .../hotelview/HotelViewDataComposer.java | 2 +- ...HotelViewExpiringCatalogPageCommposer.java | 2 +- ...elViewHideCommunityVoteButtonComposer.java | 2 +- .../HotelViewNextLTDAvailableComposer.java | 2 +- .../HotelViewSecondsUntilComposer.java | 2 +- .../outgoing/hotelview/NewsListComposer.java | 2 +- .../outgoing/inventory/AddBotComposer.java | 2 +- .../inventory/AddHabboItemComposer.java | 2 +- .../outgoing/inventory/AddPetComposer.java | 2 +- .../inventory/EffectsListAddComposer.java | 2 +- .../EffectsListEffectEnableComposer.java | 2 +- .../inventory/EffectsListRemoveComposer.java | 2 +- .../InventoryAchievementsComposer.java | 2 +- .../inventory/InventoryBadgesComposer.java | 2 +- .../inventory/InventoryBotsComposer.java | 2 +- .../inventory/InventoryItemsComposer.java | 2 +- .../inventory/InventoryPetsComposer.java | 2 +- .../inventory/InventoryRefreshComposer.java | 2 +- .../InventoryUpdateItemComposer.java | 2 +- .../outgoing/inventory/RemoveBotComposer.java | 2 +- .../inventory/RemoveHabboItemComposer.java | 2 +- .../outgoing/inventory/RemovePetComposer.java | 2 +- .../inventory/UserEffectsListComposer.java | 2 +- .../modtool/BullyReportRequestComposer.java | 2 +- .../modtool/BullyReportedMessageComposer.java | 2 +- .../modtool/CfhTopicsMessageComposer.java | 2 +- .../HelperRequestDisabledComposer.java | 2 +- .../outgoing/modtool/ModToolComposer.java | 2 +- .../modtool/ModToolIssueChatlogComposer.java | 2 +- .../modtool/ModToolIssueHandledComposer.java | 2 +- ...ModToolIssueHandlerDimensionsComposer.java | 2 +- .../modtool/ModToolIssueInfoComposer.java | 2 +- .../ModToolIssueResponseAlertComposer.java | 2 +- .../modtool/ModToolIssueUpdateComposer.java | 2 +- .../ModToolReportReceivedAlertComposer.java | 2 +- .../modtool/ModToolRoomChatlogComposer.java | 2 +- .../modtool/ModToolRoomInfoComposer.java | 2 +- .../modtool/ModToolSanctionInfoComposer.java | 2 +- .../modtool/ModToolUserChatlogComposer.java | 2 +- .../modtool/ModToolUserInfoComposer.java | 2 +- .../ModToolUserRoomVisitsComposer.java | 2 +- .../modtool/ReportRoomFormComposer.java | 2 +- .../navigator/CanCreateEventComposer.java | 2 +- .../navigator/CanCreateRoomComposer.java | 2 +- ...NewNavigatorCategoryUserCountComposer.java | 2 +- ...wNavigatorCollapsedCategoriesComposer.java | 2 +- .../NewNavigatorEventCategoriesComposer.java | 2 +- .../NewNavigatorLiftedRoomsComposer.java | 2 +- .../NewNavigatorMetaDataComposer.java | 2 +- .../NewNavigatorSavedSearchesComposer.java | 2 +- .../NewNavigatorSearchResultsComposer.java | 2 +- .../NewNavigatorSettingsComposer.java | 2 +- .../OpenRoomCreationWindowComposer.java | 2 +- .../navigator/PrivateRoomsComposer.java | 2 +- .../navigator/RoomCategoriesComposer.java | 2 +- .../navigator/RoomCreatedComposer.java | 2 +- .../outgoing/navigator/TagsComposer.java | 2 +- .../outgoing/polls/PollQuestionsComposer.java | 2 +- .../outgoing/polls/PollStartComposer.java | 2 +- .../infobus/SimplePollAnswerComposer.java | 2 +- .../infobus/SimplePollAnswersComposer.java | 2 +- .../infobus/SimplePollStartComposer.java | 2 +- .../quests/QuestCompletedComposer.java | 2 +- .../outgoing/quests/QuestComposer.java | 2 +- .../outgoing/quests/QuestExpiredComposer.java | 2 +- .../outgoing/quests/QuestionInfoComposer.java | 2 +- .../outgoing/quests/QuestsComposer.java | 2 +- .../BotForceOpenContextMenuComposer.java | 2 +- .../outgoing/rooms/BotSettingsComposer.java | 2 +- .../rooms/DoorbellAddUserComposer.java | 2 +- .../rooms/FavoriteRoomChangedComposer.java | 2 +- .../outgoing/rooms/FloodCounterComposer.java | 2 +- .../outgoing/rooms/ForwardToRoomComposer.java | 2 +- .../outgoing/rooms/FreezeLivesComposer.java | 2 +- .../outgoing/rooms/HideDoorbellComposer.java | 2 +- .../rooms/KnockKnockUnknownComposer.java | 2 +- .../rooms/RoomAccessDeniedComposer.java | 2 +- .../rooms/RoomAddRightsListComposer.java | 2 +- .../rooms/RoomBannedUsersComposer.java | 2 +- .../rooms/RoomChatSettingsComposer.java | 2 +- .../outgoing/rooms/RoomDataComposer.java | 2 +- .../rooms/RoomEditSettingsErrorComposer.java | 2 +- .../rooms/RoomEnterErrorComposer.java | 2 +- .../outgoing/rooms/RoomEntryInfoComposer.java | 2 +- .../rooms/RoomFilterWordsComposer.java | 2 +- .../RoomFloorThicknessUpdatedComposer.java | 2 +- .../outgoing/rooms/RoomHeightMapComposer.java | 2 +- .../outgoing/rooms/RoomModelComposer.java | 2 +- .../outgoing/rooms/RoomMutedComposer.java | 2 +- .../outgoing/rooms/RoomNoRightsComposer.java | 2 +- .../outgoing/rooms/RoomOpenComposer.java | 2 +- .../outgoing/rooms/RoomOwnerComposer.java | 2 +- .../outgoing/rooms/RoomPaintComposer.java | 2 +- .../outgoing/rooms/RoomPaneComposer.java | 2 +- .../rooms/RoomQueueStatusMessage.java | 2 +- .../rooms/RoomRelativeMapComposer.java | 2 +- .../rooms/RoomRemoveRightsListComposer.java | 2 +- .../outgoing/rooms/RoomRightsComposer.java | 2 +- .../rooms/RoomRightsListComposer.java | 2 +- .../outgoing/rooms/RoomScoreComposer.java | 2 +- .../outgoing/rooms/RoomSettingsComposer.java | 2 +- .../rooms/RoomSettingsSavedComposer.java | 2 +- .../rooms/RoomSettingsUpdatedComposer.java | 2 +- .../outgoing/rooms/RoomThicknessComposer.java | 2 +- .../rooms/UpdateStackHeightComposer.java | 2 +- .../rooms/items/AddFloorItemComposer.java | 2 +- .../rooms/items/AddWallItemComposer.java | 2 +- .../items/FloorItemOnRollerComposer.java | 2 +- .../rooms/items/FloorItemUpdateComposer.java | 2 +- .../rooms/items/ItemExtraDataComposer.java | 2 +- .../rooms/items/ItemIntStateComposer.java | 2 +- .../rooms/items/ItemStateComposer.java | 2 +- .../rooms/items/ItemsDataUpdateComposer.java | 2 +- .../rooms/items/MoodLightDataComposer.java | 2 +- .../rooms/items/PostItDataComposer.java | 2 +- .../items/PostItStickyPoleOpenComposer.java | 2 +- .../items/PresentItemOpenedComposer.java | 2 +- .../rooms/items/RemoveFloorItemComposer.java | 2 +- .../rooms/items/RemoveWallItemComposer.java | 2 +- .../rooms/items/RoomFloorItemsComposer.java | 2 +- .../rooms/items/RoomWallItemsComposer.java | 2 +- .../UpdateStackHeightTileHeightComposer.java | 2 +- .../rooms/items/WallItemUpdateComposer.java | 2 +- .../items/jukebox/JukeBoxMySongsComposer.java | 2 +- .../JukeBoxNowPlayingMessageComposer.java | 2 +- .../JukeBoxPlayListAddSongComposer.java | 2 +- .../jukebox/JukeBoxPlayListComposer.java | 2 +- .../JukeBoxPlayListUpdatedComposer.java | 2 +- .../jukebox/JukeBoxPlaylistFullComposer.java | 2 +- .../jukebox/JukeBoxTrackCodeComposer.java | 2 +- .../jukebox/JukeBoxTrackDataComposer.java | 2 +- .../LoveLockFurniFinishedComposer.java | 2 +- .../LoveLockFurniFriendConfirmedComposer.java | 2 +- .../lovelock/LoveLockFurniStartComposer.java | 2 +- .../RentableSpaceInfoComposer.java | 2 +- .../RentableSpaceUnknown2Composer.java | 2 +- .../RentableSpaceUnknownComposer.java | 2 +- .../youtube/YoutubeDisplayListComposer.java | 2 +- .../youtube/YoutubeStateChangeComposer.java | 2 +- .../items/youtube/YoutubeVideoComposer.java | 2 +- .../CantScratchPetNotOldEnoughComposer.java | 2 +- .../rooms/pets/PetInformationComposer.java | 2 +- .../rooms/pets/PetLevelUpComposer.java | 2 +- .../rooms/pets/PetLevelUpdatedComposer.java | 2 +- .../rooms/pets/PetPackageComposer.java | 2 +- .../PetPackageNameValidationComposer.java | 2 +- .../rooms/pets/PetStatusUpdateComposer.java | 2 +- .../rooms/pets/PetTrainingPanelComposer.java | 2 +- .../outgoing/rooms/pets/RoomPetComposer.java | 2 +- .../rooms/pets/RoomPetExperienceComposer.java | 2 +- .../pets/RoomPetHorseFigureComposer.java | 2 +- .../rooms/pets/RoomPetRespectComposer.java | 2 +- .../pets/breeding/PetBreedingCompleted.java | 2 +- .../breeding/PetBreedingFailedComposer.java | 2 +- .../breeding/PetBreedingResultComposer.java | 2 +- .../breeding/PetBreedingStartComposer.java | 2 +- .../PetBreedingStartFailedComposer.java | 2 +- .../PromoteOwnRoomsListComposer.java | 2 +- .../RoomPromotionMessageComposer.java | 2 +- .../users/ChangeNameUpdatedComposer.java | 2 +- .../rooms/users/RoomUnitIdleComposer.java | 2 +- .../rooms/users/RoomUnitOnRollerComposer.java | 2 +- .../rooms/users/RoomUserActionComposer.java | 2 +- .../rooms/users/RoomUserDanceComposer.java | 2 +- .../rooms/users/RoomUserDataComposer.java | 2 +- .../rooms/users/RoomUserEffectComposer.java | 2 +- .../rooms/users/RoomUserHandItemComposer.java | 2 +- .../rooms/users/RoomUserIgnoredComposer.java | 2 +- .../users/RoomUserNameChangedComposer.java | 2 +- .../RoomUserReceivedHandItemComposer.java | 2 +- .../rooms/users/RoomUserRemoveComposer.java | 2 +- .../users/RoomUserRemoveRightsComposer.java | 2 +- .../rooms/users/RoomUserRespectComposer.java | 2 +- .../rooms/users/RoomUserShoutComposer.java | 2 +- .../rooms/users/RoomUserStatusComposer.java | 2 +- .../rooms/users/RoomUserTagsComposer.java | 2 +- .../rooms/users/RoomUserTalkComposer.java | 2 +- .../rooms/users/RoomUserTypingComposer.java | 2 +- .../rooms/users/RoomUserUnbannedComposer.java | 2 +- .../rooms/users/RoomUserWhisperComposer.java | 2 +- .../users/RoomUsersAddGuildBadgeComposer.java | 2 +- .../rooms/users/RoomUsersComposer.java | 2 +- .../users/RoomUsersGuildBadgesComposer.java | 2 +- .../trading/OtherTradingDisabledComposer.java | 2 +- .../trading/TradeAcceptedComposer.java | 2 +- .../trading/TradeCloseWindowComposer.java | 2 +- .../outgoing/trading/TradeClosedComposer.java | 2 +- .../trading/TradeCompleteComposer.java | 2 +- .../outgoing/trading/TradeStartComposer.java | 2 +- .../trading/TradeStartFailComposer.java | 2 +- .../outgoing/trading/TradeUpdateComposer.java | 2 +- .../TradingWaitingConfirmComposer.java | 2 +- .../trading/YouTradingDisabledComposer.java | 2 +- .../unknown/BuildersClubExpiredComposer.java | 2 +- .../unknown/CloseWebPageComposer.java | 2 +- .../CompetitionEntrySubmitResultComposer.java | 2 +- .../ConvertedForwardToRoomComposer.java | 2 +- .../unknown/EpicPopupFrameComposer.java | 2 +- .../outgoing/unknown/ErrorLoginComposer.java | 2 +- .../unknown/ExtendClubMessageComposer.java | 2 +- .../outgoing/unknown/HabboMallComposer.java | 2 +- .../unknown/IgnoredUsersComposer.java | 2 +- .../unknown/MessengerErrorComposer.java | 2 +- .../unknown/MinimailNewMessageComposer.java | 2 +- .../outgoing/unknown/ModToolComposerOne.java | 2 +- .../unknown/ModToolSanctionDataComposer.java | 2 +- .../MostUselessErrorAlertComposer.java | 2 +- .../unknown/MysteryPrizeComposer.java | 2 +- .../unknown/RemoveRoomEventComposer.java | 2 +- .../RentableItemBuyOutPriceComposer.java | 2 +- .../outgoing/unknown/RoomAdErrorComposer.java | 2 +- .../RoomCategoryUpdateMessageComposer.java | 2 +- .../RoomMessagesPostedCountComposer.java | 2 +- .../unknown/RoomUnknown3Composer.java | 2 +- .../RoomUserQuestionAnsweredComposer.java | 2 +- .../unknown/SnowWarsAddUserComposer.java | 2 +- .../outgoing/unknown/SnowWarsCompose1.java | 2 +- .../SnowWarsFullGameStatusComposer.java | 2 +- .../SnowWarsGameStartedErrorComposer.java | 2 +- .../unknown/SnowWarsGenericErrorComposer.java | 2 +- .../unknown/SnowWarsInitGameArena.java | 2 +- .../unknown/SnowWarsJoinErrorComposer.java | 2 +- .../unknown/SnowWarsLevelDataComposer.java | 2 +- .../unknown/SnowWarsLoadingArenaComposer.java | 2 +- .../unknown/SnowWarsLongDataComposer.java | 2 +- .../unknown/SnowWarsOnGameEnding.java | 2 +- .../unknown/SnowWarsOnStageEnding.java | 2 +- .../SnowWarsOnStageRunningComposer.java | 2 +- .../unknown/SnowWarsOnStageStartComposer.java | 2 +- .../SnowWarsPlayNowWindowComposer.java | 2 +- .../unknown/SnowWarsPreviousRoomComposer.java | 2 +- .../unknown/SnowWarsQuePositionComposer.java | 2 +- .../unknown/SnowWarsQuickJoinComposer.java | 2 +- .../unknown/SnowWarsRemoveUserComposer.java | 2 +- .../unknown/SnowWarsResetTimerComposer.java | 2 +- .../unknown/SnowWarsStartLobbyCounter.java | 2 +- .../unknown/SnowWarsUnknownComposer.java | 2 +- .../unknown/SnowWarsUserChatComposer.java | 2 +- .../SnowWarsUserEnteredArenaComposer.java | 2 +- .../SnowWarsUserExitArenaComposer.java | 2 +- .../TalentTrackEmailFailedComposer.java | 2 +- .../TalentTrackEmailVerifiedComposer.java | 2 +- .../unknown/UnknownAdManagerComposer.java | 2 +- .../unknown/UnknownAvatarEditorComposer.java | 2 +- .../UnknownCatalogPageOfferComposer.java | 2 +- .../unknown/UnknownCompetitionComposer.java | 2 +- .../outgoing/unknown/UnknownComposer4.java | 2 +- .../outgoing/unknown/UnknownComposer5.java | 2 +- .../outgoing/unknown/UnknownComposer8.java | 2 +- .../unknown/UnknownFurniModelComposer.java | 2 +- .../unknown/UnknownGuild2Composer.java | 2 +- .../unknown/UnknownGuildComposer3.java | 2 +- .../unknown/UnknownHabboWayQuizComposer.java | 2 +- .../unknown/UnknownHelperComposer.java | 2 +- .../outgoing/unknown/UnknownHintComposer.java | 2 +- .../UnknownMessengerErrorComposer.java | 2 +- .../unknown/UnknownPollQuestionComposer.java | 2 +- .../unknown/UnknownRoomDesktopComposer.java | 2 +- .../unknown/UnknownRoomViewerComposer.java | 2 +- .../unknown/UnknownStatusComposer.java | 2 +- .../unknown/UnknownTradeComposer.java | 2 +- .../unknown/UnkownPetPackageComposer.java | 2 +- .../unknown/UserClassificationComposer.java | 2 +- .../unknown/VipTutorialsStartComposer.java | 2 +- .../unknown/WatchAndEarnRewardComposer.java | 2 +- .../outgoing/unknown/WelcomeGiftComposer.java | 2 +- .../unknown/WelcomeGiftErrorComposer.java | 2 +- .../outgoing/users/AddUserBadgeComposer.java | 2 +- .../users/ChangeNameCheckResultComposer.java | 2 +- .../users/ClubGiftReceivedComposer.java | 2 +- .../users/FavoriteRoomsCountComposer.java | 2 +- .../users/MeMenuSettingsComposer.java | 2 +- .../outgoing/users/MutedWhisperComposer.java | 2 +- .../users/ProfileFriendsComposer.java | 2 +- .../users/UpdateUserLookComposer.java | 2 +- .../users/UserAchievementScoreComposer.java | 2 +- .../outgoing/users/UserBCLimitsComposer.java | 2 +- .../outgoing/users/UserBadgesComposer.java | 2 +- .../users/UserCitizinShipComposer.java | 2 +- .../outgoing/users/UserClothesComposer.java | 2 +- .../outgoing/users/UserClubComposer.java | 2 +- .../outgoing/users/UserCreditsComposer.java | 2 +- .../outgoing/users/UserCurrencyComposer.java | 2 +- .../outgoing/users/UserDataComposer.java | 2 +- .../outgoing/users/UserHomeRoomComposer.java | 2 +- .../outgoing/users/UserPerksComposer.java | 2 +- .../users/UserPermissionsComposer.java | 2 +- .../outgoing/users/UserPointsComposer.java | 2 +- .../outgoing/users/UserProfileComposer.java | 2 +- .../outgoing/users/UserWardrobeComposer.java | 2 +- .../VerifyMobileNumberComposer.java | 2 +- .../VerifyMobilePhoneCodeWindowComposer.java | 2 +- .../VerifyMobilePhoneDoneComposer.java | 2 +- .../VerifyMobilePhoneWindowComposer.java | 2 +- .../wired/WiredConditionDataComposer.java | 2 +- .../wired/WiredEffectDataComposer.java | 2 +- .../outgoing/wired/WiredOpenComposer.java | 2 +- .../wired/WiredRewardAlertComposer.java | 2 +- .../outgoing/wired/WiredSavedComposer.java | 2 +- .../wired/WiredTriggerDataComposer.java | 2 +- .../eu/habbo/messages/rcon/FriendRequest.java | 2 +- .../encoders/GameServerMessageEncoder.java | 1 + .../java/com/eu/habbo/util/DebugUtils.java | 22 +++++ 483 files changed, 582 insertions(+), 522 deletions(-) create mode 100644 src/main/java/com/eu/habbo/messages/ServerMessageException.java create mode 100644 src/main/java/com/eu/habbo/util/DebugUtils.java diff --git a/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java b/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java index 9799350d..d593d1ff 100644 --- a/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java +++ b/src/main/java/com/eu/habbo/core/RoomUserPetComposer.java @@ -19,7 +19,7 @@ public class RoomUserPetComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUsersComposer); this.response.appendInt(1); this.response.appendInt(this.habbo.getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java b/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java index e1b88271..d948c332 100644 --- a/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/bots/BotManager.java @@ -6,7 +6,6 @@ import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.*; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.habbohotel.users.cache.HabboOfferPurchase; import com.eu.habbo.messages.outgoing.generic.alerts.BotErrorComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.BubbleAlertKeys; diff --git a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClient.java b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClient.java index b9b81e4d..4242467d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClient.java +++ b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClient.java @@ -87,14 +87,7 @@ public class GameClient { } public void sendResponse(MessageComposer composer) { - if (this.channel.isOpen()) { - try { - this.channel.write(composer.compose().retain(), this.channel.voidPromise()); - this.channel.flush(); - } catch (Exception e) { - LOGGER.error("Caught exception", e); - } - } + this.sendResponse(composer.compose()); } public void sendResponse(ServerMessage response) { diff --git a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java index c8460d57..ad9b28ff 100644 --- a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java @@ -5,7 +5,6 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.networking.gameserver.GameServerAttributes; import io.netty.channel.*; -import io.netty.util.AttributeKey; import java.util.ArrayList; import java.util.List; 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 a645676e..ca92ccf4 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 @@ -7,7 +7,6 @@ import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboGender; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.inventory.EffectsComponent; -import com.eu.habbo.messages.outgoing.inventory.UserEffectsListComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMultiHeight.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMultiHeight.java index efce0c5a..765b6e3b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMultiHeight.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMultiHeight.java @@ -11,7 +11,6 @@ import com.eu.habbo.habbohotel.wired.WiredEffectType; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import gnu.trove.set.hash.THashSet; -import org.apache.commons.math3.util.Pair; import java.sql.ResultSet; import java.sql.SQLException; 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 daff0b5d..a23586ba 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 @@ -9,9 +9,6 @@ import com.eu.habbo.messages.outgoing.rooms.items.FloorItemOnRollerComposer; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Optional; public class InteractionPuzzleBox extends HabboItem { public InteractionPuzzleBox(ResultSet set, Item baseItem) throws SQLException { 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 55b96e98..33e0679d 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 @@ -16,8 +16,6 @@ import com.eu.habbo.util.pathfinding.Rotation; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.ExecutionException; public class InteractionVendingMachine extends HabboItem { 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 1653fcee..c891286e 100644 --- a/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/modtool/ModToolManager.java @@ -1,7 +1,6 @@ package com.eu.habbo.habbohotel.modtool; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.bots.BotManager; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; diff --git a/src/main/java/com/eu/habbo/messages/ServerMessage.java b/src/main/java/com/eu/habbo/messages/ServerMessage.java index b6e5a840..f43831d1 100644 --- a/src/main/java/com/eu/habbo/messages/ServerMessage.java +++ b/src/main/java/com/eu/habbo/messages/ServerMessage.java @@ -1,42 +1,43 @@ package com.eu.habbo.messages; +import com.eu.habbo.util.DebugUtils; import com.eu.habbo.util.PacketUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; import io.netty.buffer.Unpooled; +import io.netty.util.IllegalReferenceCountException; import io.netty.util.ReferenceCounted; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import java.util.concurrent.atomic.AtomicInteger; public class ServerMessage implements ReferenceCounted { private static final Logger LOGGER = LoggerFactory.getLogger(ServerMessage.class); + private boolean initialized; private int header; + private AtomicInteger refs; private ByteBufOutputStream stream; private ByteBuf channelBuffer; public ServerMessage() { - this.channelBuffer = Unpooled.buffer(); - this.stream = new ByteBufOutputStream(this.channelBuffer); + } public ServerMessage(int header) { - this.header = header; - this.channelBuffer = Unpooled.buffer(); - this.stream = new ByteBufOutputStream(this.channelBuffer); - try { - this.stream.writeInt(0); - this.stream.writeShort(header); - } catch (Exception e) { - LOGGER.error("ServerMessage exception", e); - } + this.init(header); } public ServerMessage init(int id) { + if (this.initialized) { + throw new ServerMessageException("ServerMessage was already initialized."); + } + this.header = id; + this.refs = new AtomicInteger(0); this.channelBuffer = Unpooled.buffer(); this.stream = new ByteBufOutputStream(this.channelBuffer); @@ -44,8 +45,9 @@ public class ServerMessage implements ReferenceCounted { this.stream.writeInt(0); this.stream.writeShort(id); } catch (Exception e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } + return this; } @@ -53,7 +55,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.write(bytes); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -68,7 +70,7 @@ public class ServerMessage implements ReferenceCounted { this.stream.writeShort(data.length); this.stream.write(data); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -76,7 +78,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeChar(obj); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -84,7 +86,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeChars(obj.toString()); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -92,7 +94,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeInt(obj); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -105,7 +107,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeInt((int) obj); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -113,7 +115,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeInt(obj ? 1 : 0); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -121,7 +123,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeShort((short) obj); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -129,7 +131,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeByte(b); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -137,7 +139,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeBoolean(obj); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -145,7 +147,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeDouble(d); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -153,7 +155,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.writeDouble(obj); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } } @@ -161,7 +163,7 @@ public class ServerMessage implements ReferenceCounted { try { this.stream.write(obj.get().array()); } catch (IOException e) { - LOGGER.error("ServerMessage exception", e); + throw new ServerMessageException(e); } return this; @@ -187,40 +189,64 @@ public class ServerMessage implements ReferenceCounted { @Override public int refCnt() { - return this.channelBuffer.refCnt(); + return this.refs.get(); } @Override public ReferenceCounted retain() { - this.channelBuffer.retain(); + int result = this.refs.incrementAndGet(); + + if (this.header == 1167 || this.header == 2024 || this.header == 2505) { + System.out.printf("retain Packet: %d Count: %d From: %s%n", this.header, result, DebugUtils.getCallerCallerStacktrace()); + } + return this; } @Override public ReferenceCounted retain(int i) { - this.channelBuffer.retain(i); + int result = this.refs.addAndGet(i); + + if (this.header == 1167 || this.header == 2024 || this.header == 2505) { + System.out.printf("retain Packet: %d Count: %d From: %s%n", this.header, result, DebugUtils.getCallerCallerStacktrace()); + } + return this; } @Override public ReferenceCounted touch() { - this.channelBuffer.touch(); return this; } @Override public ReferenceCounted touch(Object o) { - this.channelBuffer.touch(o); return this; } + @Override public boolean release() { - return this.channelBuffer.release(); + return this.release(1); } @Override public boolean release(int i) { - return this.channelBuffer.release(i); + int value = this.refs.addAndGet(-i); + + if (this.header == 1167 || this.header == 2024 || this.header == 2505) { + System.out.printf("release Packet: %d Count: %d From: %s%n", this.header, value, DebugUtils.getCallerCallerStacktrace()); + } + + if (value < 0) { + throw new IllegalReferenceCountException("Decremented below 0 (packet " + this.header + " value " + value + ")."); + } + + if (value == 0) { + this.channelBuffer.release(); + return true; + } + + return false; } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/ServerMessageException.java b/src/main/java/com/eu/habbo/messages/ServerMessageException.java new file mode 100644 index 00000000..17e5ecbb --- /dev/null +++ b/src/main/java/com/eu/habbo/messages/ServerMessageException.java @@ -0,0 +1,20 @@ +package com.eu.habbo.messages; + +public class ServerMessageException extends RuntimeException { + + public ServerMessageException() { + } + + public ServerMessageException(String message) { + super(message); + } + + public ServerMessageException(String message, Throwable cause) { + super(message, cause); + } + + public ServerMessageException(Throwable cause) { + super(cause); + } + +} diff --git a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveFavoriteEvent.java b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveFavoriteEvent.java index 9f92df68..cd97c727 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveFavoriteEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/guilds/GuildRemoveFavoriteEvent.java @@ -4,7 +4,6 @@ import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.guilds.Guild; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.guilds.GuildFavoriteRoomUserUpdateComposer; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersAddGuildBadgeComposer; import com.eu.habbo.messages.outgoing.users.UserProfileComposer; import com.eu.habbo.plugin.events.guilds.GuildRemovedFavoriteEvent; diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/IsFirstLoginOfDayComposer.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/IsFirstLoginOfDayComposer.java index 33410ab0..39fa17ee 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/IsFirstLoginOfDayComposer.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/IsFirstLoginOfDayComposer.java @@ -12,7 +12,7 @@ public class IsFirstLoginOfDayComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.IsFirstLoginOfDayComposer); this.response.appendBoolean(this.isFirstLoginOfDay); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/UnknownComposer5.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/UnknownComposer5.java index d9940903..7cea96ee 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/UnknownComposer5.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/UnknownComposer5.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UnknownComposer5 extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownComposer5); this.response.appendString(""); //Box color this.response.appendString(""); //Key color diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java index c0f23ebf..f212e698 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/youtube/YoutubeRequestStateChange.java @@ -1,7 +1,6 @@ package com.eu.habbo.messages.incoming.rooms.items.youtube; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.items.YoutubeManager; import com.eu.habbo.habbohotel.items.interactions.InteractionYoutubeTV; import com.eu.habbo.habbohotel.permissions.Permission; import com.eu.habbo.habbohotel.rooms.Room; diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java index 2a50be89..24e8004c 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/users/RoomUserLookAtPoint.java @@ -1,6 +1,5 @@ package com.eu.habbo.messages.incoming.rooms.users; -import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.rooms.RoomUnit; @@ -8,7 +7,6 @@ import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; -import com.eu.habbo.plugin.events.users.UserIdleEvent; public class RoomUserLookAtPoint extends MessageHandler { @Override diff --git a/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java index 1afb84ce..d55e8db8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/MessageComposer.java @@ -3,11 +3,23 @@ package com.eu.habbo.messages.outgoing; import com.eu.habbo.messages.ServerMessage; public abstract class MessageComposer { + + private ServerMessage composed; protected final ServerMessage response; protected MessageComposer() { + this.composed = null; this.response = new ServerMessage(); } - public abstract ServerMessage compose(); + protected abstract ServerMessage composeInternal(); + + public ServerMessage compose() { + if (this.composed == null) { + this.composed = this.composeInternal(); + } + + return this.composed; + } + } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java index 54418f38..be1660fe 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java @@ -21,7 +21,7 @@ public class AchievementListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AchievementListComposer); try { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementProgressComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementProgressComposer.java index 28d41bbb..8cf649b7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementProgressComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementProgressComposer.java @@ -18,7 +18,7 @@ public class AchievementProgressComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AchievementProgressComposer); int achievementProgress; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java index 71489157..ca2449f3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementUnlockedComposer.java @@ -17,7 +17,7 @@ public class AchievementUnlockedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AchievementUnlockedComposer); AchievementLevel level = this.achievement.getLevelForProgress(this.habbo.getHabboStats().getAchievementProgress(this.achievement)); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java index 6f954e4e..3a515350 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentLevelUpdateComposer.java @@ -17,7 +17,7 @@ public class TalentLevelUpdateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TalentLevelUpdateComposer); this.response.appendString(this.talentTrackType.name()); this.response.appendInt(this.talentTrackLevel.level); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java index d9a00946..87515a2b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/talenttrack/TalentTrackComposer.java @@ -23,7 +23,7 @@ public class TalentTrackComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TalentTrackComposer); this.response.appendString(this.type.name().toLowerCase()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java index e013614d..31d4ef68 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraCompetitionStatusComposer.java @@ -14,7 +14,7 @@ public class CameraCompetitionStatusComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CameraCompetitionStatusComposer); this.response.appendBoolean(this.unknownBoolean); this.response.appendString(this.unknownString); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java index 15932016..133352c9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPriceComposer.java @@ -16,7 +16,7 @@ public class CameraPriceComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CameraPriceComposer); this.response.appendInt(this.credits); this.response.appendInt(this.points); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java index defe9a68..9c012410 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPublishWaitMessageComposer.java @@ -16,7 +16,7 @@ public class CameraPublishWaitMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CameraPublishWaitMessageComposer); this.response.appendBoolean(this.isOk); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseSuccesfullComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseSuccesfullComposer.java index ffc6b17b..293f840a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseSuccesfullComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraPurchaseSuccesfullComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CameraPurchaseSuccesfullComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CameraPurchaseSuccesfullComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java index ab037eee..39279844 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraRoomThumbnailSavedComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CameraRoomThumbnailSavedComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CameraRoomThumbnailSavedComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java index 6096f59a..414f6f57 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/camera/CameraURLComposer.java @@ -12,7 +12,7 @@ public class CameraURLComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CameraURLComposer); this.response.appendString(this.URL); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java index bea4faca..d6688e42 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertLimitedSoldOutComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class AlertLimitedSoldOutComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AlertLimitedSoldOutComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseFailedComposer.java index 4a1ad45d..4a8a456a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseFailedComposer.java @@ -15,7 +15,7 @@ public class AlertPurchaseFailedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AlertPurchaseFailedComposer); this.response.appendInt(this.error); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java index 5d426976..fb4f8095 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/AlertPurchaseUnavailableComposer.java @@ -15,7 +15,7 @@ public class AlertPurchaseUnavailableComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AlertPurchaseUnavailableComposer); this.response.appendInt(this.code); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java index 1fdf629e..4c45a1db 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogModeComposer.java @@ -12,7 +12,7 @@ public class CatalogModeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CatalogModeComposer); this.response.appendInt(this.mode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java index 82962855..9c0c682f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPageComposer.java @@ -29,7 +29,7 @@ public class CatalogPageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CatalogPageComposer); this.response.appendInt(this.page.getId()); this.response.appendString(this.mode); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java index 1a23cd62..a6bb52ca 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogPagesListComposer.java @@ -25,7 +25,7 @@ public class CatalogPagesListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { try { List pages = Emulator.getGameEnvironment().getCatalogManager().getCatalogPages(-1, this.habbo); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java index 397e61cd..640683db 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogSearchResultComposer.java @@ -13,7 +13,7 @@ public class CatalogSearchResultComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CatalogSearchResultComposer); this.item.serialize(this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogUpdatedComposer.java index 10eeffa7..8c82f2c7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/CatalogUpdatedComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CatalogUpdatedComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CatalogUpdatedComposer); this.response.appendBoolean(false); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java index 800b9df8..28b1472c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubCenterDataComposer.java @@ -24,7 +24,7 @@ public class ClubCenterDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ClubCenterDataComposer); this.response.appendInt(this.streakDuration); //streakduration in days this.response.appendString(this.joinDate); //joindate diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java index 787c6eed..6d44e75d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubDataComposer.java @@ -20,7 +20,7 @@ public class ClubDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ClubDataComposer); List offers = Emulator.getGameEnvironment().getCatalogManager().getClubOffers(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java index eb51719b..f4e1161d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ClubGiftsComposer.java @@ -12,7 +12,7 @@ import java.util.NoSuchElementException; public class ClubGiftsComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ClubGiftsComposer); this.response.appendInt(0); //Days Until Next Gift diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/DiscountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/DiscountComposer.java index 966bfa96..387e2a2e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/DiscountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/DiscountComposer.java @@ -12,7 +12,7 @@ public class DiscountComposer extends MessageComposer { public static int[] ADDITIONAL_DISCOUNT_THRESHOLDS = new int[]{40, 99}; @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.DiscountComposer); this.response.appendInt(MAXIMUM_ALLOWED_ITEMS); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java index 466d97a9..cf66be10 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftConfigurationComposer.java @@ -9,7 +9,7 @@ import java.util.Map; public class GiftConfigurationComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GiftConfigurationComposer); this.response.appendBoolean(true); this.response.appendInt(Emulator.getConfig().getInt("hotel.gifts.special.price", 2)); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftReceiverNotFoundComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftReceiverNotFoundComposer.java index c848b083..27ee4e34 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftReceiverNotFoundComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/GiftReceiverNotFoundComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GiftReceiverNotFoundComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GiftReceiverNotFoundComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java index b395ec71..ec20a8ae 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/NotEnoughPointsTypeComposer.java @@ -16,7 +16,7 @@ public class NotEnoughPointsTypeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NotEnoughPointsTypeComposer); this.response.appendBoolean(this.isCredits); this.response.appendBoolean(this.isPixels); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBoughtNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBoughtNotificationComposer.java index a44503db..f2ed562e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBoughtNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBoughtNotificationComposer.java @@ -15,7 +15,7 @@ public class PetBoughtNotificationComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetBoughtNotificationComposer); this.response.appendBoolean(this.gift); this.pet.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java index 50ee6de8..a469dfa0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetBreedsComposer.java @@ -16,7 +16,7 @@ public class PetBreedsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { if (this.petRaces == null) return null; this.response.init(Outgoing.PetBreedsComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java index 089d0569..c392c97e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java @@ -20,7 +20,7 @@ public class PetNameErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetNameErrorComposer); this.response.appendInt(this.type); this.response.appendString(this.value); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java index 26098398..1750480a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/PurchaseOKComposer.java @@ -17,7 +17,7 @@ public class PurchaseOKComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PurchaseOKComposer); if (this.catalogItem != null) { this.catalogItem.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java index 22c1e5ba..54cfc606 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerCompleteComposer.java @@ -15,7 +15,7 @@ public class RecyclerCompleteComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RecyclerCompleteComposer); this.response.appendInt(this.code); this.response.appendInt(0); //prize ID. diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerLogicComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerLogicComposer.java index 4f1acbcd..8d1890a2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerLogicComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RecyclerLogicComposer.java @@ -11,7 +11,7 @@ import java.util.Map; public class RecyclerLogicComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RecyclerLogicComposer); this.response.appendInt(Emulator.getGameEnvironment().getCatalogManager().prizes.size()); for (Map.Entry> map : Emulator.getGameEnvironment().getCatalogManager().prizes.entrySet()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java index 3071affb..1632021f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherErrorComposer.java @@ -15,7 +15,7 @@ public class RedeemVoucherErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RedeemVoucherErrorComposer); this.response.appendString(this.code + ""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java index 3458f781..b1988773 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/RedeemVoucherOKComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RedeemVoucherOKComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RedeemVoucherOKComposer); this.response.appendString(""); this.response.appendString(""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java index 2aacdfa9..a6432eeb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ReloadRecyclerComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class ReloadRecyclerComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ReloadRecyclerComposer); this.response.appendInt(1); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java index 67f8cfa7..ee8cbb66 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/TargetedOfferComposer.java @@ -17,7 +17,7 @@ public class TargetedOfferComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TargetedOfferComposer); HabboOfferPurchase purchase = HabboOfferPurchase.getOrCreate(this.habbo, this.offer.getId()); this.offer.serialize(this.response, purchase); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java index d8281ad4..800bd4ca 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceBuyErrorComposer.java @@ -23,7 +23,7 @@ public class MarketplaceBuyErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MarketplaceBuyErrorComposer); this.response.appendInt(this.errorCode); //result this.response.appendInt(this.unknown); //newOfferId diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java index 2676297a..97d24627 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceCancelSaleComposer.java @@ -15,7 +15,7 @@ public class MarketplaceCancelSaleComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MarketplaceCancelSaleComposer); this.response.appendInt(this.offer.getOfferId()); this.response.appendBoolean(this.success); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigComposer.java index 9e52ecbd..1ee4ac18 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceConfigComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MarketplaceConfigComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MarketplaceConfigComposer); this.response.appendBoolean(true); this.response.appendInt(1); //Commision Percentage. diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java index 896ad5ea..f9f5f6ec 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemInfoComposer.java @@ -13,7 +13,7 @@ public class MarketplaceItemInfoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MarketplaceItemInfoComposer); MarketPlace.serializeItemInfo(this.itemId, this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java index 0f76450f..2489af8b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceItemPostedComposer.java @@ -17,7 +17,7 @@ public class MarketplaceItemPostedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MarketplaceItemPostedComposer); this.response.appendInt(this.code); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java index dca0d0d8..e2e28d34 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOffersComposer.java @@ -16,7 +16,7 @@ public class MarketplaceOffersComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MarketplaceOffersComposer); int total = 0; this.response.appendInt(this.offers.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java index d230697b..b02c1c0e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceOwnItemsComposer.java @@ -20,7 +20,7 @@ public class MarketplaceOwnItemsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MarketplaceOwnItemsComposer); this.response.appendInt(this.habbo.getInventory().getSoldPriceTotal()); this.response.appendInt(this.habbo.getInventory().getMarketplaceItems().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java index 9c87a6e4..0834ed4c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/marketplace/MarketplaceSellItemComposer.java @@ -20,7 +20,7 @@ public class MarketplaceSellItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MarketplaceSellItemComposer); this.response.appendInt(this.errorCode); this.response.appendInt(this.valueA); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java index a47a92e5..0c2254e3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftableProductsComposer.java @@ -19,7 +19,7 @@ public class CraftableProductsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CraftableProductsComposer); this.response.appendInt(this.recipes.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java index 42630413..a8db6787 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipeComposer.java @@ -16,7 +16,7 @@ public class CraftingRecipeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CraftingRecipeComposer); this.response.appendInt(this.recipe.getIngredients().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java index 7da993a9..5f0c7739 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingRecipesAvailableComposer.java @@ -14,7 +14,7 @@ public class CraftingRecipesAvailableComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CraftingComposerFour); this.response.appendInt((this.found ? -1 : 0) + this.count); this.response.appendBoolean(this.found); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java index 0bc63cde..d7967e80 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/crafting/CraftingResultComposer.java @@ -20,7 +20,7 @@ public class CraftingResultComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CraftingResultComposer); this.response.appendBoolean(this.succes); //succes diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java index d171c3b2..82c512f2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarDataComposer.java @@ -22,7 +22,7 @@ public class AdventCalendarDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AdventCalendarDataComposer); this.response.appendString(this.eventName); this.response.appendString(""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java index 15c08771..999eefbb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/AdventCalendarProductComposer.java @@ -16,7 +16,7 @@ public class AdventCalendarProductComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AdventCalendarProductComposer); this.response.appendBoolean(this.visible); this.response.appendString(this.rewardObject.getItem().getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java index 1955ab93..c1593cea 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxCloseComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MysticBoxCloseComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MysticBoxCloseComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java index ff450fe2..f5e95b3d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxPrizeComposer.java @@ -14,7 +14,7 @@ public class MysticBoxPrizeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MysticBoxPrizeComposer); this.response.appendString(this.type); this.response.appendInt(this.itemId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java index 99b826dd..b88c73cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/mysticbox/MysticBoxStartOpenComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MysticBoxStartOpenComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MysticBoxStartOpenComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java index 4bc4be89..741b9443 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionCompletedComposer.java @@ -12,7 +12,7 @@ public class NewYearResolutionCompletedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewYearResolutionCompletedComposer); this.response.appendString(this.badge); this.response.appendString(this.badge); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java index 7cf0b693..7b2a4252 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class NewYearResolutionComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { //:test 817 i:230 i:1 i:1 i:1 s:NY2013RES i:3 i:0 i:60000000 this.response.init(Outgoing.NewYearResolutionComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java index 8b90878f..c478f2e8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionProgressComposer.java @@ -22,7 +22,7 @@ public class NewYearResolutionProgressComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewYearResolutionProgressComposer); this.response.appendInt(this.stuffId); this.response.appendInt(this.achievementId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java index 48635c9f..3cccbe14 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorBlockedTilesComposer.java @@ -15,7 +15,7 @@ public class FloorPlanEditorBlockedTilesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FloorPlanEditorBlockedTilesComposer); THashSet tileList = this.room.getLockedTiles(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java index 0753f323..21874ea4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/floorplaneditor/FloorPlanEditorDoorSettingsComposer.java @@ -13,7 +13,7 @@ public class FloorPlanEditorDoorSettingsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FloorPlanEditorDoorSettingsComposer); this.response.appendInt(this.room.getLayout().getDoorX()); this.response.appendInt(this.room.getLayout().getDoorY()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java index 168153ae..4806b437 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendChatMessageComposer.java @@ -25,7 +25,7 @@ public class FriendChatMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FriendChatMessageComposer); this.response.appendInt(this.toId); this.response.appendString(this.message.getMessage()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendFindingRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendFindingRoomComposer.java index 226f906d..8c100a69 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendFindingRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendFindingRoomComposer.java @@ -15,7 +15,7 @@ public class FriendFindingRoomComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FriendFindingRoomComposer); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java index 47847c34..9e9ed2fb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendNotificationComposer.java @@ -24,7 +24,7 @@ public class FriendNotificationComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FriendToolbarNotificationComposer); this.response.appendString(this.userId + ""); this.response.appendInt(this.type); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java index 66188f6e..005ac3d8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestComposer.java @@ -13,7 +13,7 @@ public class FriendRequestComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FriendRequestComposer); this.response.appendInt(this.habbo.getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java index 37385c35..751dbc77 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendRequestErrorComposer.java @@ -16,7 +16,7 @@ public class FriendRequestErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FriendRequestErrorComposer); this.response.appendInt(0); this.response.appendInt(this.errorCode); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java index 6832ff9e..0253f33f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/FriendsComposer.java @@ -22,7 +22,7 @@ public class FriendsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { try { this.response.init(Outgoing.FriendsComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java index b77206c5..fb3314b4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/LoadFriendRequestsComposer.java @@ -14,7 +14,7 @@ public class LoadFriendRequestsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.LoadFriendRequestsComposer); synchronized (this.habbo.getMessenger().getFriendRequests()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java index 948bfe35..a48e6e65 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/MessengerInitComposer.java @@ -14,7 +14,7 @@ public class MessengerInitComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MessengerInitComposer); if (this.habbo.hasPermission("acc_infinite_friends")) { this.response.appendInt(Integer.MAX_VALUE); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java index a9c10163..34cbe1b4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/RemoveFriendComposer.java @@ -18,7 +18,7 @@ public class RemoveFriendComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UpdateFriendComposer); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java index 3aba1888..1b761a51 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteComposer.java @@ -14,7 +14,7 @@ public class RoomInviteComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomInviteComposer); this.response.appendInt(this.userId); this.response.appendString(this.message); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java index 1543d09c..b2d3c54c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/RoomInviteErrorComposer.java @@ -17,7 +17,7 @@ public class RoomInviteErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomInviteErrorComposer); this.response.appendInt(this.errorCode); this.response.appendInt(this.buddies.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java index cecf26a1..7eac0a99 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/StalkErrorComposer.java @@ -17,7 +17,7 @@ public class StalkErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.StalkErrorComposer); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java index 7f96aab7..907fa9a0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/UpdateFriendComposer.java @@ -22,7 +22,7 @@ public class UpdateFriendComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UpdateFriendComposer); if (this.buddy != null) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java index 0bb07e6b..7c66c3de 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/friends/UserSearchResultComposer.java @@ -25,7 +25,7 @@ public class UserSearchResultComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserSearchResultComposer); List u = new ArrayList<>(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java index f44d06ab..fd8760fa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAccountInfoComposer.java @@ -14,7 +14,7 @@ public class GameCenterAccountInfoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GameCenterAccountInfoComposer); this.response.appendInt(this.gameId); this.response.appendInt(this.gamesLeft); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAchievementsConfigurationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAchievementsConfigurationComposer.java index 1d7455b5..6a78ec90 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAchievementsConfigurationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterAchievementsConfigurationComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class GameCenterAchievementsConfigurationComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(2265); this.response.appendInt(0); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java index c805811d..2d28e932 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameComposer.java @@ -17,7 +17,7 @@ public class GameCenterGameComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GameCenterGameComposer); this.response.appendInt(this.gameId); this.response.appendInt(this.status); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java index a63dd771..f8f1e25c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/GameCenterGameListComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GameCenterGameListComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GameCenterGameListComposer); this.response.appendInt(2);//Count diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java index c47d8520..6df404f1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpJoinQueueComposer.java @@ -12,7 +12,7 @@ public class BaseJumpJoinQueueComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BaseJumpJoinQueueComposer); this.response.appendInt(this.gameId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLeaveQueueComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLeaveQueueComposer.java index 423c85e3..11a5ea15 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLeaveQueueComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLeaveQueueComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class BaseJumpLeaveQueueComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BaseJumpLeaveQueueComposer); this.response.appendInt(3); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java index 1a9f998d..99d4c66e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameComposer.java @@ -18,7 +18,7 @@ public class BaseJumpLoadGameComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BaseJumpLoadGameComposer); if (this.game == 3) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameURLComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameURLComposer.java index 15caff06..906ee305 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameURLComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpLoadGameURLComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class BaseJumpLoadGameURLComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BaseJumpLoadGameURLComposer); this.response.appendInt(4); this.response.appendString("1351418858673"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpUnloadGameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpUnloadGameComposer.java index 42b44ba2..1e2df090 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpUnloadGameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/gamecenter/basejump/BaseJumpUnloadGameComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class BaseJumpUnloadGameComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BaseJumpUnloadGameComposer); this.response.appendInt(3); this.response.appendString("basejump"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/MinimailCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/MinimailCountComposer.java index 6245ffb6..34edf5a0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/MinimailCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/MinimailCountComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MinimailCountComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MinimailCountComposer); this.response.appendInt(0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java index 86b194d0..bae14e70 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/PickMonthlyClubGiftNotificationComposer.java @@ -12,7 +12,7 @@ public class PickMonthlyClubGiftNotificationComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PickMonthlyClubGiftNotificationComposer); this.response.appendInt(this.count); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java index 8eca297a..8773d9c8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BotErrorComposer.java @@ -18,7 +18,7 @@ public class BotErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BotErrorComposer); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BubbleAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BubbleAlertComposer.java index 4e8cfb46..391cd6e3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BubbleAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/BubbleAlertComposer.java @@ -28,7 +28,7 @@ public class BubbleAlertComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BubbleAlertComposer); this.response.appendString(this.errorKey); this.response.appendInt(this.keys.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java index 9d68bdf4..2e1a52de 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/CustomNotificationComposer.java @@ -18,7 +18,7 @@ public class CustomNotificationComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CustomNotificationComposer); this.response.appendInt(this.type); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java index 4b98c4ea..2b4d597a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericAlertComposer.java @@ -17,7 +17,7 @@ public class GenericAlertComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GenericAlertComposer); this.response.appendString(this.message); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java index 198b1556..2674f7d0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/GenericErrorMessagesComposer.java @@ -19,7 +19,7 @@ public class GenericErrorMessagesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GenericErrorMessages); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java index 123183eb..fc7cc923 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosedAndOpensComposer.java @@ -14,7 +14,7 @@ public class HotelClosedAndOpensComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelClosedAndOpensComposer); this.response.appendInt(this.hour); this.response.appendInt(this.minute); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java index 44c51ca9..d92497f6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelClosesAndWillOpenAtComposer.java @@ -16,7 +16,7 @@ public class HotelClosesAndWillOpenAtComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelClosesAndWillOpenAtComposer); this.response.appendInt(this.hour); this.response.appendInt(this.minute); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java index 0c7b29b8..3e9d3ad1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesAndBackInComposer.java @@ -14,7 +14,7 @@ public class HotelWillCloseInMinutesAndBackInComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelWillCloseInMinutesAndBackInComposer); this.response.appendBoolean(true); this.response.appendInt(this.closeInMinutes); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java index 30811bec..0a4f1a94 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/HotelWillCloseInMinutesComposer.java @@ -12,7 +12,7 @@ public class HotelWillCloseInMinutesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelWillCloseInMinutesComposer); this.response.appendInt(this.minutes); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java index cdb7e3b7..0003c638 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/MessagesForYouComposer.java @@ -22,7 +22,7 @@ public class MessagesForYouComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MessagesForYouComposer); this.response.appendInt(this.messages.length + this.newMessages.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetErrorComposer.java index ccffcdfe..7318ff2f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/PetErrorComposer.java @@ -19,7 +19,7 @@ public class PetErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetErrorComposer); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java index 438af967..687b43ec 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertAndOpenHabboWayComposer.java @@ -12,7 +12,7 @@ public class StaffAlertAndOpenHabboWayComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.StaffAlertAndOpenHabboWayComposer); this.response.appendString(this.message); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java index 3df101ef..7a7686cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWIthLinkAndOpenHabboWayComposer.java @@ -14,7 +14,7 @@ public class StaffAlertWIthLinkAndOpenHabboWayComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.StaffAlertWIthLinkAndOpenHabboWayComposer); this.response.appendString(this.message); this.response.appendString(this.link); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java index ce52ba79..82447982 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/StaffAlertWithLinkComposer.java @@ -14,7 +14,7 @@ public class StaffAlertWithLinkComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.StaffAlertWithLinkComposer); this.response.appendString(this.message); this.response.appendString(this.link); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java index 21094a88..5a0e70a1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/alerts/UpdateFailedComposer.java @@ -12,7 +12,7 @@ public class UpdateFailedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UpdateFailedComposer); this.response.appendString(this.message); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/generic/testcomposer.java b/src/main/java/com/eu/habbo/messages/outgoing/generic/testcomposer.java index 49caea29..74f1301c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/generic/testcomposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/generic/testcomposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class testcomposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(3019); this.response.appendInt(3); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java index e5323e30..02d23875 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianNewReportReceivedComposer.java @@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuardianNewReportReceivedComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuardianNewReportReceivedComposer); this.response.appendInt(Emulator.getConfig().getInt("guardians.accept.timer")); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java index 9365c4d3..e4209713 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingRequestedComposer.java @@ -17,7 +17,7 @@ public class GuardianVotingRequestedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { TIntIntHashMap mappedUsers = new TIntIntHashMap(); mappedUsers.put(this.ticket.getReported().getHabboInfo().getId(), 0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java index 684d0a12..a0f50fc6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingResultComposer.java @@ -19,7 +19,7 @@ public class GuardianVotingResultComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuardianVotingResultComposer); this.response.appendInt(this.ticket.getVerdict().getType()); //Final Verdict this.response.appendInt(this.vote.type.getType()); //Your vote diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingTimeEnded.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingTimeEnded.java index 32527594..d210c04b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingTimeEnded.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingTimeEnded.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuardianVotingTimeEnded extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuardianVotingTimeEnded); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java index feeea391..82138a81 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guardians/GuardianVotingVotesComposer.java @@ -19,7 +19,7 @@ public class GuardianVotingVotesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuardianVotingVotesComposer); ArrayList votes = this.ticket.getSortedVotes(this.guardian); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java index e8a048ef..f89afe9c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/BullyReportClosedComposer.java @@ -15,7 +15,7 @@ public class BullyReportClosedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BullyReportClosedComposer); this.response.appendInt(this.code); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java index 60ff434e..999ccc78 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionAttachedComposer.java @@ -16,7 +16,7 @@ public class GuideSessionAttachedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { //:test 3549 b:1 i:1 s:abcd i:100 this.response.init(Outgoing.GuideSessionAttachedComposer); this.response.appendBoolean(this.isHelper); //? //isHelper diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedComposer.java index 8db0a8ac..d68aa2a3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionDetachedComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuideSessionDetachedComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionDetachedComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java index 7ed37fdc..a08c3951 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionEndedComposer.java @@ -15,7 +15,7 @@ public class GuideSessionEndedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionEndedComposer); this.response.appendInt(this.errorCode); //? return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java index 4f8da806..1776a3e4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionErrorComposer.java @@ -16,7 +16,7 @@ public class GuideSessionErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionErrorComposer); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java index d4641448..15a7fd32 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionInvitedToGuideRoomComposer.java @@ -14,7 +14,7 @@ public class GuideSessionInvitedToGuideRoomComposer extends MessageComposer { //Helper invites noob @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionInvitedToGuideRoomComposer); this.response.appendInt(this.room != null ? this.room.getId() : 0); this.response.appendString(this.room != null ? this.room.getName() : ""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java index 1dc03b79..fdf74f78 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionMessageComposer.java @@ -13,7 +13,7 @@ public class GuideSessionMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionMessageComposer); this.response.appendString(this.message.message); //Message this.response.appendInt(this.message.userId); //Sender ID diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java index 43ef1793..496368a7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsPlayingComposer.java @@ -12,7 +12,7 @@ public class GuideSessionPartnerIsPlayingComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionPartnerIsPlayingComposer); this.response.appendBoolean(this.isPlaying); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java index c587f548..3781c455 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionPartnerIsTypingComposer.java @@ -12,7 +12,7 @@ public class GuideSessionPartnerIsTypingComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionPartnerIsTypingComposer); this.response.appendBoolean(this.typing); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java index c0b4ead6..cd6e5b85 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionRequesterRoomComposer.java @@ -13,7 +13,7 @@ public class GuideSessionRequesterRoomComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionRequesterRoomComposer); this.response.appendInt(this.room != null ? this.room.getId() : 0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java index d0e0ae64..dd1ce315 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideSessionStartedComposer.java @@ -13,7 +13,7 @@ public class GuideSessionStartedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideSessionStartedComposer); this.response.appendInt(this.tour.getNoob().getHabboInfo().getId()); this.response.appendString(this.tour.getNoob().getHabboInfo().getUsername()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java index cd4da1ff..dbcc32e7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guides/GuideToolsComposer.java @@ -13,7 +13,7 @@ public class GuideToolsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuideToolsComposer); this.response.appendBoolean(this.onDuty); //OnDuty this.response.appendInt(0); //Guides On Duty diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java index fdd2e4ba..460e6da8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildAcceptMemberErrorComposer.java @@ -18,7 +18,7 @@ public class GuildAcceptMemberErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildAcceptMemberErrorComposer); this.response.appendInt(this.guildId); this.response.appendInt(this.errorCode); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java index e8c3ed71..8c5f1ac6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBoughtComposer.java @@ -13,7 +13,7 @@ public class GuildBoughtComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildBoughtComposer); this.response.appendInt(this.guild.getRoomId()); this.response.appendInt(this.guild.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java index fe038f26..e55f9135 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildBuyRoomsComposer.java @@ -15,7 +15,7 @@ public class GuildBuyRoomsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildBuyRoomsComposer); this.response.appendInt(Emulator.getConfig().getInt("catalog.guild.price")); this.response.appendInt(this.rooms.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java index cba6099f..798fcf3c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildConfirmRemoveMemberComposer.java @@ -14,7 +14,7 @@ public class GuildConfirmRemoveMemberComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildConfirmRemoveMemberComposer); this.response.appendInt(this.userId); this.response.appendInt(this.furniCount); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java index eea708f8..17780d84 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildEditFailComposer.java @@ -17,7 +17,7 @@ public class GuildEditFailComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildEditFailComposer); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java index 118a57d7..48d9c556 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFavoriteRoomUserUpdateComposer.java @@ -16,7 +16,7 @@ public class GuildFavoriteRoomUserUpdateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildFavoriteRoomUserUpdateComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.guild.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java index 4b75f522..e4373209 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildFurniWidgetComposer.java @@ -20,7 +20,7 @@ public class GuildFurniWidgetComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildFurniWidgetComposer); this.response.appendInt(item.getId()); this.response.appendInt(this.guild.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildInfoComposer.java index edfdaa08..a4d2206f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildInfoComposer.java @@ -26,7 +26,7 @@ public class GuildInfoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { boolean adminPermissions = this.client.getHabbo().getHabboStats().hasGuild(this.guild.getId()) && this.client.getHabbo().hasPermission("acc_guild_admin"); this.response.init(Outgoing.GuildInfoComposer); this.response.appendInt(this.guild.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java index d7b12c31..00716bfb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildJoinErrorComposer.java @@ -20,7 +20,7 @@ public class GuildJoinErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildJoinErrorComposer); this.response.appendInt(this.code); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java index 7793c232..82965f0b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildListComposer.java @@ -18,7 +18,7 @@ public class GuildListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildListComposer); this.response.appendInt(this.guilds.size()); for (Guild guild : this.guilds) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java index 893d4e12..7983974b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildManageComposer.java @@ -13,7 +13,7 @@ public class GuildManageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildManageComposer); this.response.appendInt(1); this.response.appendInt(guild.getRoomId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java index f4979b51..e5a1290c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMemberUpdateComposer.java @@ -16,7 +16,7 @@ public class GuildMemberUpdateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildMemberUpdateComposer); this.response.appendInt(this.guild.getId()); this.response.appendInt(this.guildMember.getRank().type); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java index 73e98a26..8bacc764 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildMembersComposer.java @@ -33,7 +33,7 @@ public class GuildMembersComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildMembersComposer); this.response.appendInt(this.guild.getId()); this.response.appendString(this.guild.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java index 348bbd19..01cf5cf7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildPartsComposer.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class GuildPartsComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GroupPartsComposer); this.response.appendInt(Emulator.getGameEnvironment().getGuildManager().getBases().size()); for (GuildPart part : Emulator.getGameEnvironment().getGuildManager().getBases()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java index b66be090..4a0f124e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/GuildRefreshMembersListComposer.java @@ -13,7 +13,7 @@ public class GuildRefreshMembersListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildRefreshMembersListComposer); this.response.appendInt(this.guild.getId()); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java index 1d06750f..47a86dad 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/RemoveGuildFromRoomComposer.java @@ -12,7 +12,7 @@ public class RemoveGuildFromRoomComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RemoveGuildFromRoomComposer); this.response.appendInt(this.guildId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumAddCommentComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumAddCommentComposer.java index 8f267d61..3570f860 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumAddCommentComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumAddCommentComposer.java @@ -13,7 +13,7 @@ public class GuildForumAddCommentComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildForumAddCommentComposer); this.response.appendInt(this.comment.getThread().getGuildId()); //guild_id this.response.appendInt(this.comment.getThreadId()); //thread_id diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java index 688480c9..ecafc480 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumCommentsComposer.java @@ -21,7 +21,7 @@ public class GuildForumCommentsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildForumCommentsComposer); this.response.appendInt(this.guildId); //guild_id diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java index 3a64640a..db555561 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumDataComposer.java @@ -99,7 +99,7 @@ public class GuildForumDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { try { this.response.init(Outgoing.GuildForumDataComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java index 4700bc13..ebe1d96a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumListComposer.java @@ -24,7 +24,7 @@ public class GuildForumListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildForumListComposer); this.response.appendInt(this.mode); this.response.appendInt(this.guilds.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadMessagesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadMessagesComposer.java index 7fff374c..c1d77bbe 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadMessagesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadMessagesComposer.java @@ -13,7 +13,7 @@ public class GuildForumThreadMessagesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildForumThreadMessagesComposer); this.response.appendInt(this.thread.getGuildId()); this.thread.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java index 1a48b688..e5750b8e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumThreadsComposer.java @@ -22,7 +22,7 @@ public class GuildForumThreadsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { ArrayList threads; try { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java index 7adce912..e9897471 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/GuildForumsUnreadMessagesCountComposer.java @@ -12,7 +12,7 @@ public class GuildForumsUnreadMessagesCountComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.GuildForumsUnreadMessagesCountComposer); this.response.appendInt(this.count); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java index a825a44c..bdf20b7c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/PostUpdateMessageComposer.java @@ -17,7 +17,7 @@ public class PostUpdateMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PostUpdateMessageComposer); this.response.appendInt(this.guildId); //guild_id diff --git a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java index 4476859a..96ab2eab 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/guilds/forums/ThreadUpdatedMessageComposer.java @@ -28,7 +28,7 @@ public class ThreadUpdatedMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ThreadUpdateMessageComposer); this.response.appendInt(this.thread.getGuildId()); this.thread.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java index e790df29..d2f73e4d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer1.java @@ -14,7 +14,7 @@ public class HabboWayQuizComposer1 extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HabboWayQuizComposer1); this.response.appendString(this.name); this.response.appendInt(this.items.length); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer2.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer2.java index d7af917a..dd3086e5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer2.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/HabboWayQuizComposer2.java @@ -14,7 +14,7 @@ public class HabboWayQuizComposer2 extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HabboWayQuizComposer2); this.response.appendString(this.name); this.response.appendInt(this.items.length); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java index 3dcdb902..ec2a8b49 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserGiftComposer.java @@ -15,7 +15,7 @@ public class NewUserGiftComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewUserGiftComposer); this.response.appendInt(this.options.size()); for (List option : this.options) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java index ab33e8c5..13c03ace 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NewUserIdentityComposer.java @@ -13,7 +13,7 @@ public class NewUserIdentityComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewUserIdentityComposer); this.response.appendInt(this.habbo.noobStatus()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java index 6f77c800..02188a04 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/habboway/nux/NuxAlertComposer.java @@ -12,7 +12,7 @@ public class NuxAlertComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NuxAlertComposer); this.response.appendString(this.link); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java index 96dfda3b..dc2c5fbc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/CompleteDiffieHandshakeComposer.java @@ -19,7 +19,7 @@ public class CompleteDiffieHandshakeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CompleteDiffieHandshakeComposer); this.response.appendString(this.publicKey); this.response.appendBoolean(this.clientEncryption); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/ConnectionErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/ConnectionErrorComposer.java index 6548dbe1..fb01eff7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/ConnectionErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/ConnectionErrorComposer.java @@ -22,7 +22,7 @@ public class ConnectionErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ConnectionErrorComposer); this.response.appendInt(this.messageId); this.response.appendInt(this.errorCode); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/DebugConsoleComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/DebugConsoleComposer.java index d55249a9..4ea035af 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/DebugConsoleComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/DebugConsoleComposer.java @@ -12,7 +12,7 @@ public class DebugConsoleComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.DebugConsoleComposer); this.response.appendBoolean(this.debugging); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java index 2952edde..72ffdb0e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/InitDiffieHandshakeComposer.java @@ -15,7 +15,7 @@ public class InitDiffieHandshakeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.InitDiffieHandshakeComposer); this.response.appendString(this.signedPrime); this.response.appendString(this.signedGenerator); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java index 136ba08c..3e5736b2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/MachineIDComposer.java @@ -13,7 +13,7 @@ public class MachineIDComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MachineIDComposer); this.response.appendString(this.client.getMachineId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java index a3f793aa..c30c6afd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/PongComposer.java @@ -12,7 +12,7 @@ public class PongComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PongComposer); this.response.appendInt(this.id); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/SecureLoginOKComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/SecureLoginOKComposer.java index f744fea0..03ec75fe 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/SecureLoginOKComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/SecureLoginOKComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class SecureLoginOKComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.SecureLoginOKComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/SessionRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/SessionRightsComposer.java index a015de24..b442e4e0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/SessionRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/SessionRightsComposer.java @@ -9,7 +9,7 @@ public class SessionRightsComposer extends MessageComposer { private static final boolean unknownBooleanTwo = false; @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.SessionRightsComposer); this.response.appendBoolean(unknownBooleanOne); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/SomeConnectionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/SomeConnectionComposer.java index 1214e126..5a1e6724 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/SomeConnectionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/SomeConnectionComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class SomeConnectionComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.SomeConnectionComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareComposer.java index 183a66b5..1c38778c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/BonusRareComposer.java @@ -14,7 +14,7 @@ public class BonusRareComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BonusRareComposer); this.response.appendString(Emulator.getConfig().getValue("hotelview.promotional.reward.name", "prizetrophy_breed_gold")); //Furniture Name. Note: Image is in external_variables.txt this.response.appendInt(Emulator.getConfig().getInt("hotelview.promotional.reward.id", 0)); //Furniture ID diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java index 4fd87102..ef796dbd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HallOfFameComposer.java @@ -18,7 +18,7 @@ public class HallOfFameComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HallOfFameComposer); this.response.appendString(this.hallOfFame.getCompetitionName()); this.response.appendInt(this.hallOfFame.getWinners().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java index 8fea5e48..501103db 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewBadgeButtonConfigComposer.java @@ -14,7 +14,7 @@ public class HotelViewBadgeButtonConfigComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewBadgeButtonConfigComposer); this.response.appendString(this.badge); this.response.appendBoolean(this.enabled); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java index d7078845..bc98a0c4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCatalogPageExpiringComposer.java @@ -16,7 +16,7 @@ public class HotelViewCatalogPageExpiringComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewCatalogPageExpiringComposer); this.response.appendString(this.name); this.response.appendInt(this.time); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java index 29d2be40..f1614f5c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCommunityGoalComposer.java @@ -40,7 +40,7 @@ public class HotelViewCommunityGoalComposer extends MessageComposer { //:test 1579 b:1 i:0 i:1 i:2 i:3 i:4 i:5 s:a i:6 i:1 i:1 @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewCommunityGoalComposer); this.response.appendBoolean(this.achieved); //Achieved? this.response.appendInt(this.personalContributionScore); //User Amount diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewComposer.java index 7fe5d3d6..26dd8cb8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class HotelViewComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java index 78185a7a..87a90fca 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewConcurrentUsersComposer.java @@ -20,7 +20,7 @@ public class HotelViewConcurrentUsersComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewConcurrentUsersComposer); this.response.appendInt(this.state); this.response.appendInt(this.userCount); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java index 656a4b14..f31e3203 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewCustomTimerComposer.java @@ -14,7 +14,7 @@ public class HotelViewCustomTimerComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewCustomTimerComposer); this.response.appendString(this.name); //Send by the client. this.response.appendInt(this.seconds); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java index c6ca95ce..1271d5f8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewDataComposer.java @@ -14,7 +14,7 @@ public class HotelViewDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewDataComposer); this.response.appendString(this.data); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java index 7421e972..bc0b082c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewExpiringCatalogPageCommposer.java @@ -15,7 +15,7 @@ public class HotelViewExpiringCatalogPageCommposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewExpiringCatalogPageCommposer); this.response.appendString(this.page.getCaption()); this.response.appendInt(this.page.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java index 149568c4..6a32b5d7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewHideCommunityVoteButtonComposer.java @@ -12,7 +12,7 @@ public class HotelViewHideCommunityVoteButtonComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewHideCommunityVoteButtonComposer); this.response.appendBoolean(this.unknownBoolean); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java index f4c78872..d922cebf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewNextLTDAvailableComposer.java @@ -18,7 +18,7 @@ public class HotelViewNextLTDAvailableComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewNextLTDAvailableComposer); this.response.appendInt(this.time); this.response.appendInt(this.pageId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java index d258dc2a..91538dcc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/HotelViewSecondsUntilComposer.java @@ -14,7 +14,7 @@ public class HotelViewSecondsUntilComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HotelViewSecondsUntilComposer); this.response.appendString(this.dateString); this.response.appendInt(this.seconds); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/NewsListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/NewsListComposer.java index 5e3a029c..bdb6e594 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/hotelview/NewsListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/hotelview/NewsListComposer.java @@ -9,7 +9,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class NewsListComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewsWidgetsComposer); NewsList newsList = Emulator.getGameEnvironment().getHotelViewManager().getNewsList(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddBotComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddBotComposer.java index 7f618642..fc64df03 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddBotComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddBotComposer.java @@ -13,7 +13,7 @@ public class AddBotComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AddBotComposer); this.response.appendInt(this.bot.getId()); this.response.appendString(this.bot.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java index 841f4307..266d413d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddHabboItemComposer.java @@ -41,7 +41,7 @@ public class AddHabboItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AddHabboItemComposer); if (this.ids != null) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddPetComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddPetComposer.java index 616a5167..150d6782 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddPetComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AddPetComposer.java @@ -13,7 +13,7 @@ public class AddPetComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AddPetComposer); this.pet.serialize(this.response); this.response.appendBoolean(false); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java index dfb76d6b..f5187607 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java @@ -14,7 +14,7 @@ public class EffectsListAddComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.EffectsListAddComposer); this.response.appendInt(this.effect.effect); //Type this.response.appendInt(0); //Unknown Costume? diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java index c3408a6f..8b107b53 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java @@ -13,7 +13,7 @@ public class EffectsListEffectEnableComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.EffectsListEffectEnableComposer); this.response.appendInt(this.effect.effect); //Type this.response.appendInt(this.effect.duration); //Duration diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java index a142fa52..f9d8020c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java @@ -13,7 +13,7 @@ public class EffectsListRemoveComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.EffectsListRemoveComposer); this.response.appendInt(this.effect.effect); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryAchievementsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryAchievementsComposer.java index 0e25b703..40c66bb8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryAchievementsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryAchievementsComposer.java @@ -11,7 +11,7 @@ import gnu.trove.procedure.TObjectProcedure; public class InventoryAchievementsComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.InventoryAchievementsComposer); synchronized (Emulator.getGameEnvironment().getAchievementManager().getAchievements()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java index b5fc6e45..e9dd505c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBadgesComposer.java @@ -15,7 +15,7 @@ public class InventoryBadgesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { if (this.habbo == null) return null; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBotsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBotsComposer.java index a44772bf..fe3b04ef 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBotsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryBotsComposer.java @@ -15,7 +15,7 @@ public class InventoryBotsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.InventoryBotsComposer); THashMap userBots = this.habbo.getInventory().getBotsComponent().getBots(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java index 6fb8a0cd..258ce1a9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryItemsComposer.java @@ -25,7 +25,7 @@ public class InventoryItemsComposer extends MessageComposer implements TIntObjec } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { try { this.response.init(Outgoing.InventoryItemsComposer); this.response.appendInt(this.out); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java index 696fbad1..a0f97408 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryPetsComposer.java @@ -17,7 +17,7 @@ public class InventoryPetsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.InventoryPetsComposer); this.response.appendInt(1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryRefreshComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryRefreshComposer.java index 97f2c099..9bafa3dd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryRefreshComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryRefreshComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class InventoryRefreshComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.InventoryRefreshComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryUpdateItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryUpdateItemComposer.java index d7971230..c558f986 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryUpdateItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/InventoryUpdateItemComposer.java @@ -14,7 +14,7 @@ public class InventoryUpdateItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.InventoryItemUpdateComposer); this.response.appendInt(this.habboItem.getGiftAdjustedId()); this.response.appendString(this.habboItem.getBaseItem().getType().code); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java index 040de015..cda6dc61 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveBotComposer.java @@ -13,7 +13,7 @@ public class RemoveBotComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RemoveBotComposer); this.response.appendInt(this.bot.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveHabboItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveHabboItemComposer.java index c28bc240..c9855e9d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveHabboItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemoveHabboItemComposer.java @@ -12,7 +12,7 @@ public class RemoveHabboItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RemoveHabboItemComposer); this.response.appendInt(this.itemId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java index 72a6928a..af495d2e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/RemovePetComposer.java @@ -13,7 +13,7 @@ public class RemovePetComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RemovePetComposer); this.response.appendInt(this.petId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java index 2c09b324..13e42b52 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java @@ -20,7 +20,7 @@ public class UserEffectsListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserEffectsListComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java index 6dea5de4..9d648542 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportRequestComposer.java @@ -19,7 +19,7 @@ public class BullyReportRequestComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BullyReportRequestComposer); this.response.appendInt(this.errorCode); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java index e77e4492..bca14d5c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/BullyReportedMessageComposer.java @@ -18,7 +18,7 @@ public class BullyReportedMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BullyReportedMessageComposer); this.response.appendInt(this.code); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java index 73694a4b..5a7f3eea 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/CfhTopicsMessageComposer.java @@ -10,7 +10,7 @@ import gnu.trove.procedure.TObjectProcedure; public class CfhTopicsMessageComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CfhTopicsMessageComposer); this.response.appendInt(Emulator.getGameEnvironment().getModToolManager().getCfhCategories().valueCollection().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/HelperRequestDisabledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/HelperRequestDisabledComposer.java index aa136701..8c8a1d2b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/HelperRequestDisabledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/HelperRequestDisabledComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class HelperRequestDisabledComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HelperRequestDisabledComposer); this.response.appendString(""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java index 0e05c84f..d534ffef 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolComposer.java @@ -22,7 +22,7 @@ public class ModToolComposer extends MessageComposer implements TObjectProcedure } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolComposer); if (this.habbo.hasPermission("acc_modtool_ticket_q")) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java index ee8b3830..fbbc23ac 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueChatlogComposer.java @@ -32,7 +32,7 @@ public class ModToolIssueChatlogComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolIssueChatlogComposer); this.response.appendInt(this.issue.id); this.response.appendInt(this.issue.senderId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java index 5dd301c0..0cdc7ee3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandledComposer.java @@ -23,7 +23,7 @@ public class ModToolIssueHandledComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolIssueHandledComposer); this.response.appendInt(this.code); this.response.appendString(this.message); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java index b30e5d0f..225c212a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueHandlerDimensionsComposer.java @@ -18,7 +18,7 @@ public class ModToolIssueHandlerDimensionsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolIssueHandlerDimensionsComposer); this.response.appendInt(this.x); this.response.appendInt(this.y); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java index ce57afa3..6abe7b2e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueInfoComposer.java @@ -13,7 +13,7 @@ public class ModToolIssueInfoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolIssueInfoComposer); this.issue.serialize(this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java index 8f22f10c..3be76632 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueResponseAlertComposer.java @@ -12,7 +12,7 @@ public class ModToolIssueResponseAlertComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolIssueResponseAlertComposer); this.response.appendString(this.message); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java index 5034b424..e3756e71 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolIssueUpdateComposer.java @@ -13,7 +13,7 @@ public class ModToolIssueUpdateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolIssueUpdateComposer); this.issue.serialize(this.response); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java index 064385b9..6f6315e8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolReportReceivedAlertComposer.java @@ -18,7 +18,7 @@ public class ModToolReportReceivedAlertComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolReportReceivedAlertComposer); this.response.appendInt(this.errorCode); this.response.appendString(this.message); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java index 1be09ca0..50ec9796 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomChatlogComposer.java @@ -20,7 +20,7 @@ public class ModToolRoomChatlogComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolRoomChatlogComposer); this.response.appendByte(1); this.response.appendShort(2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java index 883b058d..17303cb7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolRoomInfoComposer.java @@ -13,7 +13,7 @@ public class ModToolRoomInfoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolRoomInfoComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.room.getCurrentHabbos().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java index ca323066..e343f675 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolSanctionInfoComposer.java @@ -24,7 +24,7 @@ public class ModToolSanctionInfoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { ModToolSanctions modToolSanctions = Emulator.getGameEnvironment().getModToolSanctions(); Date probationEndTime; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java index 1c8c9ac9..19ed914d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserChatlogComposer.java @@ -22,7 +22,7 @@ public class ModToolUserChatlogComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolUserChatlogComposer); this.response.appendInt(this.userId); this.response.appendString(this.username); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java index 36e63b84..e8ab502e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserInfoComposer.java @@ -25,7 +25,7 @@ public class ModToolUserInfoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolUserInfoComposer); try { this.response.appendInt(this.set.getInt("user_id")); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java index 1ccc19a3..91e4b476 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ModToolUserRoomVisitsComposer.java @@ -20,7 +20,7 @@ public class ModToolUserRoomVisitsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolUserRoomVisitsComposer); this.response.appendInt(this.habboInfo.getId()); this.response.appendString(this.habboInfo.getUsername()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java index 63601f50..5498e45d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/modtool/ReportRoomFormComposer.java @@ -15,7 +15,7 @@ public class ReportRoomFormComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ReportRoomFormComposer); this.response.appendInt(this.pendingIssues.size()); //Current standing help request(s) amount: diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateEventComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateEventComposer.java index 0df277ba..61b268ca 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateEventComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateEventComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CanCreateEventComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CanCreateEventComposer); this.response.appendBoolean(true); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java index 4bd0ffc0..051d651b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/CanCreateRoomComposer.java @@ -14,7 +14,7 @@ public class CanCreateRoomComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CanCreateRoomComposer); this.response.appendInt(this.count >= this.max ? 1 : 0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java index 311cd900..119d15f7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCategoryUserCountComposer.java @@ -15,7 +15,7 @@ public class NewNavigatorCategoryUserCountComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewNavigatorCategoryUserCountComposer); this.response.appendInt(this.roomCategories.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCollapsedCategoriesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCollapsedCategoriesComposer.java index c075460d..129cf75f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCollapsedCategoriesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorCollapsedCategoriesComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class NewNavigatorCollapsedCategoriesComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewNavigatorCollapsedCategoriesComposer); this.response.appendInt(46); this.response.appendString("new_ads"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java index baff726f..8537682d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorEventCategoriesComposer.java @@ -12,7 +12,7 @@ public class NewNavigatorEventCategoriesComposer extends MessageComposer { public static List CATEGORIES = new ArrayList<>(); @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewNavigatorEventCategoriesComposer); this.response.appendInt(NewNavigatorEventCategoriesComposer.CATEGORIES.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorLiftedRoomsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorLiftedRoomsComposer.java index 63c1eff3..6a7dc062 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorLiftedRoomsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorLiftedRoomsComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class NewNavigatorLiftedRoomsComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewNavigatorLiftedRoomsComposer); this.response.appendInt(0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorMetaDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorMetaDataComposer.java index ae8617f2..2f8eabac 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorMetaDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorMetaDataComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class NewNavigatorMetaDataComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewNavigatorMetaDataComposer); this.response.appendInt(4); this.response.appendString("official_view"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java index 93845f71..2f613c69 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSavedSearchesComposer.java @@ -16,7 +16,7 @@ public class NewNavigatorSavedSearchesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewNavigatorSavedSearchesComposer); this.response.appendInt(this.searches.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java index 83c4bcb1..0db11261 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSearchResultsComposer.java @@ -19,7 +19,7 @@ public class NewNavigatorSearchResultsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewNavigatorSearchResultsComposer); this.response.appendString(this.searchCode); this.response.appendString(this.searchQuery); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java index a893e5af..da4025a4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/NewNavigatorSettingsComposer.java @@ -13,7 +13,7 @@ public class NewNavigatorSettingsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.NewNavigatorSettingsComposer); this.response.appendInt(this.windowSettings.x); this.response.appendInt(this.windowSettings.y); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/OpenRoomCreationWindowComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/OpenRoomCreationWindowComposer.java index ba7bc5f8..1b84ba17 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/OpenRoomCreationWindowComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/OpenRoomCreationWindowComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class OpenRoomCreationWindowComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.OpenRoomCreationWindowComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java index 36a13e8c..41682c85 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/PrivateRoomsComposer.java @@ -19,7 +19,7 @@ public class PrivateRoomsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { try { this.response.init(Outgoing.PrivateRoomsComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java index 4291d38b..93137911 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCategoriesComposer.java @@ -15,7 +15,7 @@ public class RoomCategoriesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomCategoriesComposer); this.response.appendInt(this.categories.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCreatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCreatedComposer.java index f152f939..266b5fcf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCreatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/RoomCreatedComposer.java @@ -13,7 +13,7 @@ public class RoomCreatedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomCreatedComposer); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/navigator/TagsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/navigator/TagsComposer.java index ec875fbf..cc966717 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/navigator/TagsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/navigator/TagsComposer.java @@ -14,7 +14,7 @@ public class TagsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TagsComposer); this.response.appendInt(this.tags.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollQuestionsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollQuestionsComposer.java index b0c39a8d..02ff9583 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollQuestionsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollQuestionsComposer.java @@ -14,7 +14,7 @@ public class PollQuestionsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PollQuestionsComposer); this.response.appendInt(this.poll.id); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java index 5842b2e6..3486d2f6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/PollStartComposer.java @@ -13,7 +13,7 @@ public class PollStartComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PollStartComposer); this.response.appendInt(this.poll.id); this.response.appendString(this.poll.title); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswerComposer.java index e352e07c..faee66d9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswerComposer.java @@ -18,7 +18,7 @@ public class SimplePollAnswerComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.SimplePollAnswerComposer); this.response.appendInt(this.userId); this.response.appendString(this.choice); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswersComposer.java index a41a7172..18ab4680 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollAnswersComposer.java @@ -14,7 +14,7 @@ public class SimplePollAnswersComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.SimplePollAnswersComposer); this.response.appendInt(-1); this.response.appendInt(2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollStartComposer.java index 2fc95000..efa720b3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/polls/infobus/SimplePollStartComposer.java @@ -15,7 +15,7 @@ public class SimplePollStartComposer extends MessageComposer { //:test 3047 s:a i:10 i:20 i:10000 i:1 i:1 i:3 s:abcdefghijklmnopqrstuvwxyz12345678901234? i:1 s:a s:b @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.SimplePollStartComposer); this.response.appendString(this.question); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java index 3f83ab2b..dddf6a81 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestCompletedComposer.java @@ -15,7 +15,7 @@ public class QuestCompletedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.QuestCompletedComposer); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java index c75e990c..f95a4056 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestComposer.java @@ -12,7 +12,7 @@ public class QuestComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.QuestComposer); this.response.append(this.quest); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestExpiredComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestExpiredComposer.java index 8bdf6fd5..479e150f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestExpiredComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestExpiredComposer.java @@ -12,7 +12,7 @@ public class QuestExpiredComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.QuestExpiredComposer); this.response.appendBoolean(this.expired); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestionInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestionInfoComposer.java index 3703c854..1aa05743 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestionInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestionInfoComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class QuestionInfoComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.QuestionInfoComposer); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java index fd154fc3..60d877e3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/quests/QuestsComposer.java @@ -17,7 +17,7 @@ public class QuestsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.QuestsComposer); this.response.appendInt(this.quests.size()); for (Quest quest : this.quests) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java index 50fccff8..3e7a7bf3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotForceOpenContextMenuComposer.java @@ -12,7 +12,7 @@ public class BotForceOpenContextMenuComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BotForceOpenContextMenuComposer); this.response.appendInt(this.botId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotSettingsComposer.java index ff53e34e..655e5a1c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/BotSettingsComposer.java @@ -15,7 +15,7 @@ public class BotSettingsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BotSettingsComposer); this.response.appendInt(-this.bot.getId()); this.response.appendInt(this.settingId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java index 9188f1fc..0f678902 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/DoorbellAddUserComposer.java @@ -12,7 +12,7 @@ public class DoorbellAddUserComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.DoorbellAddUserComposer); this.response.appendString(this.habbo); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavoriteRoomChangedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavoriteRoomChangedComposer.java index f0407a7d..af2ce192 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavoriteRoomChangedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FavoriteRoomChangedComposer.java @@ -14,7 +14,7 @@ public class FavoriteRoomChangedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FavoriteRoomChangedComposer); this.response.appendInt(this.roomId); this.response.appendBoolean(this.favorite); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java index 5f32a7a6..90f747bd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FloodCounterComposer.java @@ -12,7 +12,7 @@ public class FloodCounterComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FloodCounterComposer); this.response.appendInt(this.time); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java index 16a3f8af..7d758d26 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/ForwardToRoomComposer.java @@ -12,7 +12,7 @@ public class ForwardToRoomComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ForwardToRoomComposer); this.response.appendInt(this.roomId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java index 8801555e..1afbc939 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/FreezeLivesComposer.java @@ -13,7 +13,7 @@ public class FreezeLivesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FreezeLivesComposer); this.response.appendInt(this.gamePlayer.getHabbo().getHabboInfo().getId()); this.response.appendInt(this.gamePlayer.getLives()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java index 65dd5d38..e9a49ee7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/HideDoorbellComposer.java @@ -12,7 +12,7 @@ public class HideDoorbellComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HideDoorbellComposer); this.response.appendString(this.username); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/KnockKnockUnknownComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/KnockKnockUnknownComposer.java index 68106528..67518055 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/KnockKnockUnknownComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/KnockKnockUnknownComposer.java @@ -12,7 +12,7 @@ public class KnockKnockUnknownComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(478); //TODO Hardcoded header this.response.appendString(this.habbo.getHabboInfo().getUsername()); this.response.appendInt(this.habbo.getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java index 16fab654..728a23b1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAccessDeniedComposer.java @@ -12,7 +12,7 @@ public class RoomAccessDeniedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomAccessDeniedComposer); this.response.appendString(this.habbo); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAddRightsListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAddRightsListComposer.java index 2220e376..6829f5f8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAddRightsListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomAddRightsListComposer.java @@ -17,7 +17,7 @@ public class RoomAddRightsListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomAddRightsListComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.userId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomBannedUsersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomBannedUsersComposer.java index 98482671..763e5a77 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomBannedUsersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomBannedUsersComposer.java @@ -19,7 +19,7 @@ public class RoomBannedUsersComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { int timeStamp = Emulator.getIntUnixTimestamp(); THashSet roomBans = new THashSet<>(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java index c9f5effa..43a971a4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomChatSettingsComposer.java @@ -13,7 +13,7 @@ public class RoomChatSettingsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomChatSettingsComposer); this.response.appendInt(this.room.getChatMode()); this.response.appendInt(this.room.getChatWeight()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java index 7d3c455c..7dea5e9f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomDataComposer.java @@ -22,7 +22,7 @@ public class RoomDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomDataComposer); this.response.appendBoolean(this.enterRoom); this.response.appendInt(this.room.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java index 8dd880bf..f53bef2c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEditSettingsErrorComposer.java @@ -24,7 +24,7 @@ public class RoomEditSettingsErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomEditSettingsErrorComposer); this.response.appendInt(this.roomId); this.response.appendInt(this.errorCode); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java index e4e16cff..a2ec60e7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEnterErrorComposer.java @@ -29,7 +29,7 @@ public class RoomEnterErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomEnterErrorComposer); this.response.appendInt(this.errorCode); this.response.appendString(this.queError); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java index 77392500..be3d1185 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomEntryInfoComposer.java @@ -13,7 +13,7 @@ public class RoomEntryInfoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomEntryInfoComposer); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getOwnerName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java index 167e0267..85b379d9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFilterWordsComposer.java @@ -13,7 +13,7 @@ public class RoomFilterWordsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomFilterWordsComposer); this.response.appendInt(this.room.getWordFilterWords().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java index eadff8b5..9d8c46c8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomFloorThicknessUpdatedComposer.java @@ -13,7 +13,7 @@ public class RoomFloorThicknessUpdatedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomFloorThicknessUpdatedComposer); this.response.appendBoolean(this.room.isHideWall()); //Hide walls? this.response.appendInt(this.room.getFloorSize()); //Floor Thickness diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomHeightMapComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomHeightMapComposer.java index ca879d5e..bfe4220d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomHeightMapComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomHeightMapComposer.java @@ -13,7 +13,7 @@ public class RoomHeightMapComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomHeightMapComposer); this.response.appendBoolean(true); this.response.appendInt(this.room.getWallHeight()); //FixedWallsHeight diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java index eb4526fe..d845f545 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomModelComposer.java @@ -13,7 +13,7 @@ public class RoomModelComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomModelComposer); this.response.appendString(this.room.getLayout().getName()); this.response.appendInt(this.room.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java index 0166cfed..7e038cc8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomMutedComposer.java @@ -13,7 +13,7 @@ public class RoomMutedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomMutedComposer); this.response.appendBoolean(this.room.isMuted()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java index 49cd1543..6f4fc613 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomNoRightsComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomNoRightsComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomNoRightsComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOpenComposer.java index 10141d45..b695c747 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOpenComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomOpenComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomOpenComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java index b1d1976e..ccdc6316 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomOwnerComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomOwnerComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomOwnerComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java index 72f7b741..6961fa62 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaintComposer.java @@ -14,7 +14,7 @@ public class RoomPaintComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomPaintComposer); this.response.appendString(this.type); this.response.appendString(this.value); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java index 3d0e6810..db8e3929 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomPaneComposer.java @@ -15,7 +15,7 @@ public class RoomPaneComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomPaneComposer); this.response.appendInt(this.room.getId()); this.response.appendBoolean(this.roomOwner); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java index 7257b7ad..4425c29d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomQueueStatusMessage.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomQueueStatusMessage extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomQueueStatusMessage); this.response.appendInt(1); //Count { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java index c500b5b2..1b31cb35 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRelativeMapComposer.java @@ -14,7 +14,7 @@ public class RoomRelativeMapComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomRelativeMapComposer); this.response.appendInt(this.room.getLayout().getMapSize() / this.room.getLayout().getMapSizeY()); this.response.appendInt(this.room.getLayout().getMapSize()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRemoveRightsListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRemoveRightsListComposer.java index 3b4e7d4f..cf12bdec 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRemoveRightsListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRemoveRightsListComposer.java @@ -16,7 +16,7 @@ public class RoomRemoveRightsListComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomRemoveRightsListComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.userId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java index f24039f8..23e5e4cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsComposer.java @@ -13,7 +13,7 @@ public class RoomRightsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomRightsComposer); this.response.appendInt(this.type.level); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsListComposer.java index 531eafa0..7a08a9d4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomRightsListComposer.java @@ -16,7 +16,7 @@ public class RoomRightsListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomRightsListComposer); this.response.appendInt(this.room.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java index c48b5197..e3e7eb7d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomScoreComposer.java @@ -14,7 +14,7 @@ public class RoomScoreComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomScoreComposer); this.response.appendInt(this.score); this.response.appendBoolean(this.canVote); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java index d0b55acf..f37dce64 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsComposer.java @@ -13,7 +13,7 @@ public class RoomSettingsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomSettingsComposer); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java index d1e17aea..b6c6ac42 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsSavedComposer.java @@ -13,7 +13,7 @@ public class RoomSettingsSavedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomSettingsSavedComposer); this.response.appendInt(this.room.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java index 9dc3bd9c..7e1041b6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomSettingsUpdatedComposer.java @@ -13,7 +13,7 @@ public class RoomSettingsUpdatedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomSettingsUpdatedComposer); this.response.appendInt(this.room.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java index 8225a28a..9a1c9ea0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/RoomThicknessComposer.java @@ -13,7 +13,7 @@ public class RoomThicknessComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomThicknessComposer); this.response.appendBoolean(this.room.isHideWall()); this.response.appendInt(this.room.getWallSize()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java index b01a6369..334581c6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/UpdateStackHeightComposer.java @@ -27,7 +27,7 @@ public class UpdateStackHeightComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { //TODO: maybe do this another way? doesn't seem to be very clean but gets the job done this.response.init(Outgoing.UpdateStackHeightComposer); if (this.updateTiles != null) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddFloorItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddFloorItemComposer.java index b1ca2d01..b27e75d9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddFloorItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddFloorItemComposer.java @@ -17,7 +17,7 @@ public class AddFloorItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AddFloorItemComposer); this.item.serializeFloorData(this.response); this.response.appendInt(this.item instanceof InteractionGift ? ((((InteractionGift) this.item).getColorId() * 1000) + ((InteractionGift) this.item).getRibbonId()) : (this.item instanceof InteractionMusicDisc ? ((InteractionMusicDisc) this.item).getSongId() : 1)); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java index e026993e..300eec19 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/AddWallItemComposer.java @@ -15,7 +15,7 @@ public class AddWallItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AddWallItemComposer); this.item.serializeWallData(this.response); this.response.appendString(this.itemOwnerName); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java index 9b867a23..abf2eee4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemOnRollerComposer.java @@ -25,7 +25,7 @@ public class FloorItemOnRollerComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { short oldX = this.item.getX(); short oldY = this.item.getY(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java index 9e611ef4..df9cf6f2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/FloorItemUpdateComposer.java @@ -15,7 +15,7 @@ public class FloorItemUpdateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FloorItemUpdateComposer); this.item.serializeFloorData(this.response); this.response.appendInt(this.item instanceof InteractionGift ? ((((InteractionGift) this.item).getColorId() * 1000) + ((InteractionGift) this.item).getRibbonId()) : (this.item instanceof InteractionMusicDisc ? ((InteractionMusicDisc) this.item).getSongId() : item.isUsable() ? 0 : 0)); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemExtraDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemExtraDataComposer.java index 8474dc57..1fe1ebfc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemExtraDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemExtraDataComposer.java @@ -13,7 +13,7 @@ public class ItemExtraDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ItemExtraDataComposer); this.response.appendString(this.item.getId() + ""); this.item.serializeExtradata(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java index 7ed2f844..af739f27 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemIntStateComposer.java @@ -14,7 +14,7 @@ public class ItemIntStateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ItemStateComposer2); this.response.appendInt(this.id); this.response.appendInt(this.value); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java index eed094b1..792b96a3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemStateComposer.java @@ -13,7 +13,7 @@ public class ItemStateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ItemStateComposer); this.response.appendInt(this.item.getId()); try { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java index 0dddc403..3e5fb517 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/ItemsDataUpdateComposer.java @@ -16,7 +16,7 @@ public class ItemsDataUpdateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ItemsDataUpdateComposer); this.response.appendInt(this.items.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java index 9306b6f9..45c934cc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/MoodLightDataComposer.java @@ -14,7 +14,7 @@ public class MoodLightDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MoodLightDataComposer); this.response.appendInt(3); //PresetCount diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java index f281234c..497317af 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItDataComposer.java @@ -13,7 +13,7 @@ public class PostItDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { if (this.postIt.getExtradata().isEmpty() || this.postIt.getExtradata().length() < 6) { this.postIt.setExtradata("FFFF33"); } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java index 89490e5b..e4151744 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PostItStickyPoleOpenComposer.java @@ -13,7 +13,7 @@ public class PostItStickyPoleOpenComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PostItStickyPoleOpenComposer); this.response.appendInt(this.item == null ? -1234 : this.item.getId()); this.response.appendString(""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java index e5df5b8d..fea440e1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/PresentItemOpenedComposer.java @@ -17,7 +17,7 @@ public class PresentItemOpenedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PresentItemOpenedComposer); this.response.appendString(this.item.getBaseItem().getType().code.toLowerCase()); this.response.appendInt(this.item.getBaseItem().getSpriteId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java index 689a1db7..9050674c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveFloorItemComposer.java @@ -20,7 +20,7 @@ public class RemoveFloorItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RemoveFloorItemComposer); this.response.appendString(this.item.getId() + ""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java index a5f73fa9..eb926801 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RemoveWallItemComposer.java @@ -13,7 +13,7 @@ public class RemoveWallItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RemoveWallItemComposer); this.response.appendString(this.item.getId() + ""); this.response.appendInt(this.item.getUserId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomFloorItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomFloorItemsComposer.java index 69fd12f2..35210fa2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomFloorItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomFloorItemsComposer.java @@ -22,7 +22,7 @@ public class RoomFloorItemsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomFloorItemsComposer); TIntObjectIterator iterator = this.furniOwnerNames.iterator(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java index f20f8a39..0f8a6696 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/RoomWallItemsComposer.java @@ -21,7 +21,7 @@ public class RoomWallItemsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomWallItemsComposer); THashMap userNames = new THashMap<>(); TIntObjectMap furniOwnerNames = this.room.getFurniOwnerNames(); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java index 85163e3f..2b378c95 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/UpdateStackHeightTileHeightComposer.java @@ -16,7 +16,7 @@ public class UpdateStackHeightTileHeightComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UpdateStackHeightTileHeightComposer); this.response.appendInt(this.item.getId()); this.response.appendInt(this.height); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java index 06378799..2a009599 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/WallItemUpdateComposer.java @@ -13,7 +13,7 @@ public class WallItemUpdateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WallItemUpdateComposer); this.item.serializeWallData(this.response); this.response.appendString(this.item.getUserId() + ""); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java index ecb18c5b..e9a61572 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxMySongsComposer.java @@ -16,7 +16,7 @@ public class JukeBoxMySongsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.JukeBoxMySongsComposer); this.response.appendInt(this.items.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java index feb27aee..9e8f0c64 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxNowPlayingMessageComposer.java @@ -17,7 +17,7 @@ public class JukeBoxNowPlayingMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.JukeBoxNowPlayingMessageComposer); if (this.track != null) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListAddSongComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListAddSongComposer.java index 2b47a767..ec65f396 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListAddSongComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListAddSongComposer.java @@ -13,7 +13,7 @@ public class JukeBoxPlayListAddSongComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.JukeBoxPlayListAddSongComposer); this.response.appendInt(this.track.getId()); this.response.appendInt(this.track.getLength() * 1000); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java index 770ebf47..29c82b72 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListComposer.java @@ -17,7 +17,7 @@ public class JukeBoxPlayListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.JukeBoxPlayListComposer); this.response.appendInt(this.totalLength); //Dunno //TODO Total play length? this.response.appendInt(this.songs.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListUpdatedComposer.java index ec12fcac..c4a0ceb4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlayListUpdatedComposer.java @@ -14,7 +14,7 @@ public class JukeBoxPlayListUpdatedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.JukeBoxPlayListUpdatedComposer); int length = 0; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullComposer.java index 2f558194..18511105 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxPlaylistFullComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class JukeBoxPlaylistFullComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.JukeBoxPlaylistFullComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackCodeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackCodeComposer.java index e72738d6..3759c337 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackCodeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackCodeComposer.java @@ -13,7 +13,7 @@ public class JukeBoxTrackCodeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.JukeBoxTrackCodeComposer); this.response.appendString(this.track.getCode()); this.response.appendInt(this.track.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java index 989b412f..77fbb08e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/jukebox/JukeBoxTrackDataComposer.java @@ -15,7 +15,7 @@ public class JukeBoxTrackDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.JukeBoxTrackDataComposer); this.response.appendInt(this.tracks.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java index 98a1fe74..ddeb2ff1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFinishedComposer.java @@ -13,7 +13,7 @@ public class LoveLockFurniFinishedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.LoveLockFurniFinishedComposer); this.response.appendInt(this.loveLock.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java index c0e2b8ae..660fbe95 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniFriendConfirmedComposer.java @@ -13,7 +13,7 @@ public class LoveLockFurniFriendConfirmedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.LoveLockFurniFriendConfirmedComposer); this.response.appendInt(this.loveLock.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java index c20d72e0..20cb7c90 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/lovelock/LoveLockFurniStartComposer.java @@ -13,7 +13,7 @@ public class LoveLockFurniStartComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.LoveLockFurniStartComposer); this.response.appendInt(this.loveLock.getId()); this.response.appendBoolean(true); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java index 4287a9fb..cbefc155 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceInfoComposer.java @@ -38,7 +38,7 @@ public class RentableSpaceInfoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { if (!(this.item instanceof InteractionRentableSpace)) return null; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java index 01d43170..81ce6b29 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknown2Composer.java @@ -12,7 +12,7 @@ public class RentableSpaceUnknown2Composer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RentableSpaceUnknown2Composer); this.response.appendInt(this.itemId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java index d8a69db3..af042c18 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/rentablespaces/RentableSpaceUnknownComposer.java @@ -12,7 +12,7 @@ public class RentableSpaceUnknownComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RentableSpaceUnknownComposer); this.response.appendInt(this.itemId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java index 9cab7508..11c6773c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeDisplayListComposer.java @@ -19,7 +19,7 @@ public class YoutubeDisplayListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.YoutubeDisplayListComposer); this.response.appendInt(this.itemId); this.response.appendInt(this.playlists.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java index 1014715e..762a5021 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeStateChangeComposer.java @@ -14,7 +14,7 @@ public class YoutubeStateChangeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.YoutubeMessageComposer3); this.response.appendInt(this.furniId); this.response.appendInt(this.state); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java index 62a56781..225220e1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/items/youtube/YoutubeVideoComposer.java @@ -19,7 +19,7 @@ public class YoutubeVideoComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.YoutubeMessageComposer2); this.response.appendInt(this.itemId); this.response.appendString(this.video.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/CantScratchPetNotOldEnoughComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/CantScratchPetNotOldEnoughComposer.java index 8d3059e9..b3e33e30 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/CantScratchPetNotOldEnoughComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/CantScratchPetNotOldEnoughComposer.java @@ -14,7 +14,7 @@ public class CantScratchPetNotOldEnoughComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CantScratchPetNotOldEnoughComposer); this.response.appendInt(this.currentAge); this.response.appendInt(this.requiredAge); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java index cdef5e5b..06a05b4a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInformationComposer.java @@ -23,7 +23,7 @@ public class PetInformationComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { double days = Math.floor((Emulator.getIntUnixTimestamp() - this.pet.getCreated()) / (3600 * 24)); this.response.init(Outgoing.PetInformationComposer); this.response.appendInt(this.pet.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java index 03c44e51..f3bf2bf9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpComposer.java @@ -13,7 +13,7 @@ public class PetLevelUpComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetLevelUpComposer); this.response.appendInt(this.pet.getId()); this.response.appendString(this.pet.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java index 72810ce9..46f76ae0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetLevelUpdatedComposer.java @@ -13,7 +13,7 @@ public class PetLevelUpdatedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetLevelUpdatedComposer); this.response.appendInt(this.pet.getRoomUnit().getId()); this.response.appendInt(this.pet.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java index cb1eff93..70f8d918 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageComposer.java @@ -13,7 +13,7 @@ public class PetPackageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.LeprechaunStarterBundleComposer); this.response.appendInt(this.item.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java index a3e8e277..9d99ade4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetPackageNameValidationComposer.java @@ -22,7 +22,7 @@ public class PetPackageNameValidationComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetPackageNameValidationComposer); this.response.appendInt(this.itemId); this.response.appendInt(this.errorCode); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java index 4c21820d..37549fe6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetStatusUpdateComposer.java @@ -15,7 +15,7 @@ public class PetStatusUpdateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetStatusUpdateComposer); this.response.appendInt(this.pet.getRoomUnit().getId()); this.response.appendInt(this.pet instanceof RideablePet && ((RideablePet) this.pet).anyoneCanRide() ? 1 : 0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java index 184cd32e..f9254269 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetTrainingPanelComposer.java @@ -18,7 +18,7 @@ public class PetTrainingPanelComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { List enabled = new ArrayList<>(); Collections.sort(this.pet.getPetData().getPetCommands()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java index d8ecdf1e..c515a694 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetComposer.java @@ -21,7 +21,7 @@ public class RoomPetComposer extends MessageComposer implements TIntObjectProced } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUsersComposer); this.response.appendInt(this.pets.size()); this.pets.forEachEntry(this); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetExperienceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetExperienceComposer.java index dab4bf05..60983021 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetExperienceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetExperienceComposer.java @@ -15,7 +15,7 @@ public class RoomPetExperienceComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomPetExperienceComposer); this.response.appendInt(this.pet.getId()); this.response.appendInt(this.pet.getRoomUnit().getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetHorseFigureComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetHorseFigureComposer.java index 09495a3c..e8f066f7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetHorseFigureComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetHorseFigureComposer.java @@ -13,7 +13,7 @@ public class RoomPetHorseFigureComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomPetHorseFigureComposer); this.response.appendInt(this.pet.getRoomUnit().getId()); this.response.appendInt(this.pet.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetRespectComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetRespectComposer.java index 0ef38a0c..59f939ed 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetRespectComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/RoomPetRespectComposer.java @@ -23,7 +23,7 @@ public class RoomPetRespectComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomPetRespectComposer); this.response.appendInt(this.type); this.response.appendInt(100); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java index 8dece8c9..2cd37d06 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingCompleted.java @@ -14,7 +14,7 @@ public class PetBreedingCompleted extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetBreedingCompleted); this.response.appendInt(this.type); this.response.appendInt(this.race); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java index 556b1f8c..b39a16a0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingFailedComposer.java @@ -14,7 +14,7 @@ public class PetBreedingFailedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetBreedingFailedComposer); this.response.appendInt(this.anInt1); this.response.appendInt(this.anInt2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java index 42145b6a..035e83c3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingResultComposer.java @@ -27,7 +27,7 @@ public class PetBreedingResultComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetBreedingResultComposer); this.response.appendInt(this.boxId); this.petOne.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartComposer.java index da164f26..55647113 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartComposer.java @@ -17,7 +17,7 @@ public class PetBreedingStartComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetBreedingStartComposer); this.response.appendInt(this.state); this.response.appendInt(this.anInt1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java index 2df336c9..6f1e51ce 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/breeding/PetBreedingStartFailedComposer.java @@ -20,7 +20,7 @@ public class PetBreedingStartFailedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PetBreedingStartFailedComposer); this.response.appendInt(this.reason); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java index 45e42070..f791a26d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/PromoteOwnRoomsListComposer.java @@ -19,7 +19,7 @@ public class PromoteOwnRoomsListComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.PromoteOwnRoomsListComposer); this.response.appendBoolean(true); this.response.appendInt(this.rooms.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java index 12403e90..6167e61c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/promotions/RoomPromotionMessageComposer.java @@ -17,7 +17,7 @@ public class RoomPromotionMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomEventMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java index 7713461f..cb72a29c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/ChangeNameUpdatedComposer.java @@ -13,7 +13,7 @@ public class ChangeNameUpdatedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ChangeNameUpdateComposer); this.response.appendInt(0); this.response.appendString(this.habbo.getHabboInfo().getUsername()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java index 3c947c5b..9a018261 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitIdleComposer.java @@ -13,7 +13,7 @@ public class RoomUnitIdleComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUnitIdleComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendBoolean(this.roomUnit.isIdle()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java index f77d520c..856e7a69 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUnitOnRollerComposer.java @@ -40,7 +40,7 @@ public class RoomUnitOnRollerComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { if (!this.room.isLoaded()) return null; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserActionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserActionComposer.java index 88acc03d..ec54fda0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserActionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserActionComposer.java @@ -16,7 +16,7 @@ public class RoomUserActionComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserActionComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.action.getAction()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java index 1487658c..f0900df7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDanceComposer.java @@ -13,7 +13,7 @@ public class RoomUserDanceComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserDanceComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.roomUnit.getDanceType().getType()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java index 87b3c2f2..322a7ac7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserDataComposer.java @@ -13,7 +13,7 @@ public class RoomUserDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserDataComposer); this.response.appendInt(this.habbo.getRoomUnit() == null ? -1 : this.habbo.getRoomUnit().getId()); this.response.appendString(this.habbo.getHabboInfo().getLook()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java index fc0a5641..8053b35e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java @@ -20,7 +20,7 @@ public class RoomUserEffectComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserEffectComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.effectId == -1 ? this.roomUnit.getEffectId() : this.effectId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java index 4a953730..2c74c8f2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserHandItemComposer.java @@ -13,7 +13,7 @@ public class RoomUserHandItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserHandItemComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.roomUnit.getHandItem()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java index e88a953b..51f7482b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserIgnoredComposer.java @@ -19,7 +19,7 @@ public class RoomUserIgnoredComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserIgnoredComposer); this.response.appendInt(this.state); this.response.appendString(this.habbo.getHabboInfo().getUsername()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java index f62b4d2e..3e43c471 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserNameChangedComposer.java @@ -29,7 +29,7 @@ public class RoomUserNameChangedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserNameChangedComposer); this.response.appendInt(this.userId); this.response.appendInt(this.roomId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java index 65a10440..121ca4ea 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserReceivedHandItemComposer.java @@ -15,7 +15,7 @@ public class RoomUserReceivedHandItemComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserReceivedHandItemComposer); this.response.appendInt(this.from.getId()); this.response.appendInt(this.handItem); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java index d270b294..9981b5b9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveComposer.java @@ -13,7 +13,7 @@ public class RoomUserRemoveComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserRemoveComposer); this.response.appendString(this.roomUnit.getId() + ""); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java index c942df8d..ccf56264 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRemoveRightsComposer.java @@ -15,7 +15,7 @@ public class RoomUserRemoveRightsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserRemoveRightsComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.habboId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java index 850d4a50..4e807eef 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserRespectComposer.java @@ -13,7 +13,7 @@ public class RoomUserRespectComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserRespectComposer); this.response.appendInt(this.habbo.getHabboInfo().getId()); this.response.appendInt(this.habbo.getHabboStats().respectPointsReceived); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java index b50a2cc8..6c8945bf 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserShoutComposer.java @@ -13,7 +13,7 @@ public class RoomUserShoutComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { if (this.roomChatMessage.getMessage().isEmpty()) return null; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java index 28f89597..4aedd6bb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserStatusComposer.java @@ -35,7 +35,7 @@ public class RoomUserStatusComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserStatusComposer); if (this.roomUnits != null) { this.response.appendInt(this.roomUnits.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java index 5951c759..a612e9e8 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTagsComposer.java @@ -13,7 +13,7 @@ public class RoomUserTagsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserTagsComposer); this.response.appendInt(this.habbo.getRoomUnit().getId()); this.response.appendInt(this.habbo.getHabboStats().tags.length); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java index a2bdce88..6af2fdb7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTalkComposer.java @@ -13,7 +13,7 @@ public class RoomUserTalkComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserTalkComposer); if (this.roomChatMessage.getMessage().isEmpty()) diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java index f725735e..b4126838 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserTypingComposer.java @@ -15,7 +15,7 @@ public class RoomUserTypingComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserTypingComposer); this.response.appendInt(this.roomUnit.getId()); this.response.appendInt(this.typing ? 1 : 0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java index 8040e40d..8390e131 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserUnbannedComposer.java @@ -15,7 +15,7 @@ public class RoomUserUnbannedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserUnbannedComposer); this.response.appendInt(this.room.getId()); this.response.appendInt(this.userId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java index f96e659e..10f8800c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserWhisperComposer.java @@ -13,7 +13,7 @@ public class RoomUserWhisperComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { if (this.roomChatMessage.getMessage().isEmpty()) return null; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java index 4f95b2db..b8340394 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersAddGuildBadgeComposer.java @@ -13,7 +13,7 @@ public class RoomUsersAddGuildBadgeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUsersGuildBadgesComposer); this.response.appendInt(1); this.response.appendInt(this.guild.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java index 3fbfba97..4b53f9c6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersComposer.java @@ -33,7 +33,7 @@ public class RoomUsersComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUsersComposer); if (this.habbo != null) { this.response.appendInt(1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java index b8e2e46f..babb2980 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUsersGuildBadgesComposer.java @@ -14,7 +14,7 @@ public class RoomUsersGuildBadgesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUsersGuildBadgesComposer); this.response.appendInt(this.guildBadges.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/OtherTradingDisabledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/OtherTradingDisabledComposer.java index 956edcde..90c23159 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/OtherTradingDisabledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/OtherTradingDisabledComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class OtherTradingDisabledComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.OtherTradingDisabledComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java index c453cc16..e6f10f66 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeAcceptedComposer.java @@ -13,7 +13,7 @@ public class TradeAcceptedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TradeAcceptedComposer); this.response.appendInt(this.tradeUser.getUserId()); this.response.appendInt(this.tradeUser.getAccepted()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCloseWindowComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCloseWindowComposer.java index 6f0b87fe..225abef7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCloseWindowComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCloseWindowComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class TradeCloseWindowComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TradeCloseWindowComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java index fb729e50..db247875 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeClosedComposer.java @@ -17,7 +17,7 @@ public class TradeClosedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TradeStoppedComposer); this.response.appendInt(this.userId); this.response.appendInt(this.errorCode); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCompleteComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCompleteComposer.java index c59cf2e9..2f21441e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCompleteComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeCompleteComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class TradeCompleteComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownTradeComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java index 3329122c..57d9118d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartComposer.java @@ -21,7 +21,7 @@ public class TradeStartComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TradeStartComposer); for (RoomTradeUser tradeUser : this.roomTrade.getRoomTradeUsers()) { this.response.appendInt(tradeUser.getHabbo().getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java index 663f925b..1012e680 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeStartFailComposer.java @@ -25,7 +25,7 @@ public class TradeStartFailComposer extends MessageComposer { this.username = username; } - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TradeStartFailComposer); this.response.appendInt(this.code); this.response.appendString(this.username); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java index 3f28f45c..14464cf1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradeUpdateComposer.java @@ -16,7 +16,7 @@ public class TradeUpdateComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TradeUpdateComposer); for (RoomTradeUser roomTradeUser : this.roomTrade.getRoomTradeUsers()) { this.response.appendInt(roomTradeUser.getUserId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingWaitingConfirmComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingWaitingConfirmComposer.java index a165fe89..40efd6c3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingWaitingConfirmComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/TradingWaitingConfirmComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class TradingWaitingConfirmComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TradingWaitingConfirmComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/trading/YouTradingDisabledComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/trading/YouTradingDisabledComposer.java index a2da47c0..ddb06e56 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/trading/YouTradingDisabledComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/trading/YouTradingDisabledComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class YouTradingDisabledComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.YouTradingDisabledComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/BuildersClubExpiredComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/BuildersClubExpiredComposer.java index 98de05c4..1be029d2 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/BuildersClubExpiredComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/BuildersClubExpiredComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class BuildersClubExpiredComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.BuildersClubExpiredComposer); this.response.appendInt(Integer.MAX_VALUE); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java index 59b0f56d..a5b22a21 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CloseWebPageComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class CloseWebPageComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CloseWebPageComposer); //Empty body return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java index 98231ad9..36db1a94 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/CompetitionEntrySubmitResultComposer.java @@ -22,7 +22,7 @@ public class CompetitionEntrySubmitResultComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.CompetitionEntrySubmitResultComposer); this.response.appendInt(this.unknownInt1); this.response.appendString(this.unknownString1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java index fd54fe97..c36eb9fb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ConvertedForwardToRoomComposer.java @@ -14,7 +14,7 @@ public class ConvertedForwardToRoomComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ConvertedForwardToRoomComposer); this.response.appendString(this.unknownString1); this.response.appendInt(this.unknownInt1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java index ea1b85e7..0fc2e05e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/EpicPopupFrameComposer.java @@ -13,7 +13,7 @@ public class EpicPopupFrameComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.EpicPopupFrameComposer); this.response.appendString(this.assetURI); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java index e43e3508..80546dd3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ErrorLoginComposer.java @@ -12,7 +12,7 @@ public class ErrorLoginComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ErrorLoginComposer); this.response.appendInt(this.errorCode); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java index 3e3a2bc2..ec7cf3a1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ExtendClubMessageComposer.java @@ -27,7 +27,7 @@ public class ExtendClubMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ExtendClubMessageComposer); this.response.appendInt(this.item.getId()); this.response.appendString(this.item.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboMallComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboMallComposer.java index 58c3475f..770fdfe0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboMallComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/HabboMallComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class HabboMallComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.HabboMallComposer); //Empty body return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersComposer.java index e9c92582..6762d807 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/IgnoredUsersComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class IgnoredUsersComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.IgnoredUsersComposer); this.response.appendInt(0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java index 03a4b53b..c16dee3c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MessengerErrorComposer.java @@ -14,7 +14,7 @@ public class MessengerErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MessengerErrorComposer); this.response.appendInt(this.errors.size()); for (Map.Entry entry : this.errors.entrySet()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MinimailNewMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MinimailNewMessageComposer.java index 65fd048c..d9534a7d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MinimailNewMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MinimailNewMessageComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MinimailNewMessageComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MinimailNewMessageComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolComposerOne.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolComposerOne.java index 28794f60..56bba68c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolComposerOne.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolComposerOne.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class ModToolComposerOne extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolComposerOne); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java index 819ee421..4cce8833 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/ModToolSanctionDataComposer.java @@ -17,7 +17,7 @@ public class ModToolSanctionDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ModToolSanctionDataComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.accountId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MostUselessErrorAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MostUselessErrorAlertComposer.java index e58e1e54..65978271 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MostUselessErrorAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MostUselessErrorAlertComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class MostUselessErrorAlertComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MostUselessErrorAlertComposer); //EMpty Body return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MysteryPrizeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MysteryPrizeComposer.java index 61f96b3b..d80cf1fa 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/MysteryPrizeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/MysteryPrizeComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class MysteryPrizeComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(427); this.response.appendString("s"); this.response.appendInt(230); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java index 543e14bb..1f052d53 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RemoveRoomEventComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RemoveRoomEventComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RemoveRoomEventComposer); //Empty Body return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java index 4c1b46e8..75b5f6db 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RentableItemBuyOutPriceComposer.java @@ -22,7 +22,7 @@ public class RentableItemBuyOutPriceComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RentableItemBuyOutPriceComposer); this.response.appendBoolean(this.unknownBoolean1); this.response.appendString(this.unknownString1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java index dcdb3d4c..0fb0752b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomAdErrorComposer.java @@ -14,7 +14,7 @@ public class RoomAdErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomAdErrorComposer); this.response.appendInt(this.errorCode); this.response.appendString(this.unknownString); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java index 5355b89d..a726d903 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomCategoryUpdateMessageComposer.java @@ -12,7 +12,7 @@ public class RoomCategoryUpdateMessageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomCategoryUpdateMessageComposer); this.response.appendInt(this.unknownInt1); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java index 20870863..8a269fed 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomMessagesPostedCountComposer.java @@ -15,7 +15,7 @@ public class RoomMessagesPostedCountComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomMessagesPostedCountComposer); this.response.appendInt(this.room.getId()); this.response.appendString(this.room.getName()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUnknown3Composer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUnknown3Composer.java index f4720d4b..0965e3e7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUnknown3Composer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUnknown3Composer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class RoomUnknown3Composer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUnknown3Composer); //Empty body return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java index 73124907..3bd9a877 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/RoomUserQuestionAnsweredComposer.java @@ -18,7 +18,7 @@ public class RoomUserQuestionAnsweredComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.RoomUserQuestionAnsweredComposer); this.response.appendInt(this.userId); this.response.appendString(this.value); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsAddUserComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsAddUserComposer.java index 2e606ddc..a05f934e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsAddUserComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsAddUserComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsAddUserComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(1880); this.response.appendInt(3); this.response.appendString("Derpface"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsCompose1.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsCompose1.java index c920fe29..5dcdc02d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsCompose1.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsCompose1.java @@ -12,7 +12,7 @@ public class SnowWarsCompose1 extends MessageComposer { //:test 1604 i:1 s:a i:10 i:2 i:3 i:4 s:1 i:3 i:10 i:1 s:Admin s:%look% s:M i:0 i:0 i:0 i:0 @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(this.header); this.response.appendInt(1); this.response.appendString("SnowStorm level " + 9); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsFullGameStatusComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsFullGameStatusComposer.java index d5736aff..c92b41d3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsFullGameStatusComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsFullGameStatusComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsFullGameStatusComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(0); this.response.appendInt(0); //Unused this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsGameStartedErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsGameStartedErrorComposer.java index 3eab79fe..ebe60a79 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsGameStartedErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsGameStartedErrorComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsGameStartedErrorComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(2860); this.response.appendInt(1); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsGenericErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsGenericErrorComposer.java index b2b1f57d..ffb6698a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsGenericErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsGenericErrorComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsGenericErrorComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(3702); this.response.appendInt(1); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsInitGameArena.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsInitGameArena.java index a72bafa1..c9b23394 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsInitGameArena.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsInitGameArena.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsInitGameArena extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(3924); this.response.appendInt(0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsJoinErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsJoinErrorComposer.java index 7fb55df3..326a0d5a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsJoinErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsJoinErrorComposer.java @@ -9,7 +9,7 @@ public class SnowWarsJoinErrorComposer extends MessageComposer { public static final int ERROR_DUPLICATE_MACHINE_ID = 2; @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(1437); this.response.appendInt(2); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLevelDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLevelDataComposer.java index d8c5896f..f92e3f55 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLevelDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLevelDataComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsLevelDataComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(3874); this.response.appendInt(0); this.response.appendInt(10); //MapID diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLoadingArenaComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLoadingArenaComposer.java index fc7f7b6d..d6f11a4f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLoadingArenaComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLoadingArenaComposer.java @@ -11,7 +11,7 @@ public class SnowWarsLoadingArenaComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(3850); this.response.appendInt(this.count); //GameID? this.response.appendInt(0); //Count diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLongDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLongDataComposer.java index f9b48707..bcd20718 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLongDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsLongDataComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsLongDataComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(2823); this.response.appendInt(1); this.response.appendString("SnowStorm level " + 10); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnGameEnding.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnGameEnding.java index 520d2128..d071179c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnGameEnding.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnGameEnding.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsOnGameEnding extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(1893); this.response.appendInt(0); //idk diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageEnding.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageEnding.java index 70e9df71..1de1d88d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageEnding.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageEnding.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsOnStageEnding extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(1140); this.response.appendInt(1); //idk return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageRunningComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageRunningComposer.java index d1a916da..b171aa26 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageRunningComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageRunningComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsOnStageRunningComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(3832); this.response.appendInt(120); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageStartComposer.java index 0ad456af..0eb4f634 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsOnStageStartComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsOnStageStartComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(889); this.response.appendInt(0); this.response.appendString("snowwar_arena_0"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsPlayNowWindowComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsPlayNowWindowComposer.java index e7eb8931..80a91216 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsPlayNowWindowComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsPlayNowWindowComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsPlayNowWindowComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(2276); this.response.appendInt(0); //status this.response.appendInt(100); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsPreviousRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsPreviousRoomComposer.java index 77dcc7a3..51b8149c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsPreviousRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsPreviousRoomComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsPreviousRoomComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(1381); this.response.appendInt(1); //room Id return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsQuePositionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsQuePositionComposer.java index 0bc871b4..73ede102 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsQuePositionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsQuePositionComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsQuePositionComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(2077); this.response.appendInt(1); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsQuickJoinComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsQuickJoinComposer.java index cb7502d2..02aa00f6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsQuickJoinComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsQuickJoinComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsQuickJoinComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(913); this.response.appendInt(1); this.response.appendString("SnowStorm level " + 9); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsRemoveUserComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsRemoveUserComposer.java index a7d986a6..01263b50 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsRemoveUserComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsRemoveUserComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsRemoveUserComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(2502); this.response.appendInt(3); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsResetTimerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsResetTimerComposer.java index 83a4e241..43336c37 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsResetTimerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsResetTimerComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsResetTimerComposer extends MessageComposer { //SnowStageRunning? @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(294); this.response.appendInt(100); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsStartLobbyCounter.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsStartLobbyCounter.java index c33d5702..20fa8a5f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsStartLobbyCounter.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsStartLobbyCounter.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsStartLobbyCounter extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(3757); this.response.appendInt(5); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUnknownComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUnknownComposer.java index fd331a8c..1dcfe052 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUnknownComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUnknownComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsUnknownComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(2869); this.response.appendString("snowwar"); this.response.appendInt(0); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserChatComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserChatComposer.java index c5987bab..d9268e57 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserChatComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserChatComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsUserChatComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(2049); this.response.appendInt(1); //UserID this.response.appendString("Message"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserEnteredArenaComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserEnteredArenaComposer.java index ca819281..4bd4de90 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserEnteredArenaComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserEnteredArenaComposer.java @@ -11,7 +11,7 @@ public class SnowWarsUserEnteredArenaComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(3425); if (this.type == 1) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserExitArenaComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserExitArenaComposer.java index 7522a245..1962c130 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserExitArenaComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/SnowWarsUserExitArenaComposer.java @@ -5,7 +5,7 @@ import com.eu.habbo.messages.outgoing.MessageComposer; public class SnowWarsUserExitArenaComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(3811); this.response.appendInt(1); //userId this.response.appendInt(1); //IDK ? TEAM? diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java index d2960135..efcabe5b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailFailedComposer.java @@ -12,7 +12,7 @@ public class TalentTrackEmailFailedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TalentTrackEmailFailedComposer); this.response.appendInt(this.result); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java index 87f4250d..119a0b36 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/TalentTrackEmailVerifiedComposer.java @@ -16,7 +16,7 @@ public class TalentTrackEmailVerifiedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.TalentTrackEmailVerifiedComposer); this.response.appendString(this.email); this.response.appendBoolean(this.unknownB1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java index c5613934..d690e8a9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAdManagerComposer.java @@ -12,7 +12,7 @@ public class UnknownAdManagerComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownAdManagerComposer); this.response.appendBoolean(this.unknownBoolean); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java index 0a5afef1..5ff0d0c5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java @@ -12,7 +12,7 @@ public class UnknownAvatarEditorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownAvatarEditorComposer); this.response.appendInt(this.type); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java index ef67851b..0ce8fbd0 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCatalogPageOfferComposer.java @@ -15,7 +15,7 @@ public class UnknownCatalogPageOfferComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownCatalogPageOfferComposer); this.response.appendInt(this.pageId); this.catalogItem.serialize(this.response); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java index 6c567402..903e322c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownCompetitionComposer.java @@ -18,7 +18,7 @@ public class UnknownCompetitionComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownCompetitionComposer); this.response.appendInt(this.unknownInt1); this.response.appendString(this.unknownString1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer4.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer4.java index b097234b..780db475 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer4.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer4.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UnknownComposer4 extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.IsFirstLoginOfDayComposer); this.response.appendBoolean(false); //Think something related to promo. Not sure though. return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer5.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer5.java index 600b280d..f9e18d7a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer5.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer5.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UnknownComposer5 extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownComposer5); this.response.appendInt(0); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java index 5fd770ce..99417c98 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownComposer8.java @@ -16,7 +16,7 @@ public class UnknownComposer8 extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownComposer8); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.userId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownFurniModelComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownFurniModelComposer.java index 1f48b509..e4c3d621 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownFurniModelComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownFurniModelComposer.java @@ -15,7 +15,7 @@ public class UnknownFurniModelComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownFurniModelComposer); this.response.appendInt(this.item.getId()); this.response.appendInt(this.unknownInt); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java index f754d562..dab7e51e 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuild2Composer.java @@ -12,7 +12,7 @@ public class UnknownGuild2Composer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownGuild2Composer); this.response.appendInt(this.guildId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java index 92ed45aa..c82577c7 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownGuildComposer3.java @@ -12,7 +12,7 @@ public class UnknownGuildComposer3 extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownGuildComposer3); this.response.appendInt(this.userId); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHabboWayQuizComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHabboWayQuizComposer.java index 69e80c39..5c1a6b06 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHabboWayQuizComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHabboWayQuizComposer.java @@ -16,7 +16,7 @@ public class UnknownHabboWayQuizComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownHabboWayQuizComposer); this.response.appendString(this.unknownString); this.response.appendInt(this.unknownIntegerList.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java index 60cd0fff..ed2f4104 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHelperComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UnknownHelperComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownHelperComposer); //Empty body return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHintComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHintComposer.java index fd3683cb..82ff7d27 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHintComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownHintComposer.java @@ -12,7 +12,7 @@ public class UnknownHintComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownHintComposer); this.response.appendString(this.key); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java index 36205b53..5f62eecd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownMessengerErrorComposer.java @@ -16,7 +16,7 @@ public class UnknownMessengerErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownMessengerErrorComposer); this.response.appendInt(this.errorCode); this.response.appendInt(this.userId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java index 972d64d7..61705142 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownPollQuestionComposer.java @@ -16,7 +16,7 @@ public class UnknownPollQuestionComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.SimplePollAnswersComposer); this.response.appendInt(this.unknownInt); this.response.appendInt(this.unknownMap.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java index db5221e7..d535af23 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomDesktopComposer.java @@ -16,7 +16,7 @@ public class UnknownRoomDesktopComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownRoomDesktopComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownMap.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java index 54446677..703a08e6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownRoomViewerComposer.java @@ -14,7 +14,7 @@ public class UnknownRoomViewerComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownRoomViewerComposer); this.response.appendInt(this.unknownMap.size()); for (Map.Entry entry : this.unknownMap.entrySet()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownStatusComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownStatusComposer.java index d4c0f902..cfa8c309 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownStatusComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownStatusComposer.java @@ -15,7 +15,7 @@ public class UnknownStatusComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownStatusComposer); this.response.appendInt(this.status); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownTradeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownTradeComposer.java index 8d1a1ca9..052655e3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownTradeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownTradeComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UnknownTradeComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownTradeComposer); //Empty Body return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnkownPetPackageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnkownPetPackageComposer.java index e33142e3..337951a1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnkownPetPackageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnkownPetPackageComposer.java @@ -14,7 +14,7 @@ public class UnkownPetPackageComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnkownPetPackageComposer); this.response.appendInt(this.unknownMap.size()); for (Map.Entry entry : this.unknownMap.entrySet()) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java index c679545d..f7c3213a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/UserClassificationComposer.java @@ -15,7 +15,7 @@ public class UserClassificationComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserClassificationComposer); this.response.appendInt(this.info.size()); for (Pair> set : this.info) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java index e9a8b86b..3c2412c5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/VipTutorialsStartComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class VipTutorialsStartComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.VipTutorialsStartComposer); //Empty Body return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java index 17eb79e2..06dd2b9d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WatchAndEarnRewardComposer.java @@ -13,7 +13,7 @@ public class WatchAndEarnRewardComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WatchAndEarnRewardComposer); this.response.appendString(this.item.getType().code); this.response.appendInt(this.item.getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java index 6e41e4cb..8345ec60 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftComposer.java @@ -20,7 +20,7 @@ public class WelcomeGiftComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WelcomeGiftComposer); this.response.appendString(this.email); this.response.appendBoolean(this.unknownB1); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java index 3f94d436..afb1fde5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/WelcomeGiftErrorComposer.java @@ -17,7 +17,7 @@ public class WelcomeGiftErrorComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WelcomeGiftErrorComposer); this.response.appendInt(this.error); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java index ac7a38bd..7074188f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/AddUserBadgeComposer.java @@ -13,7 +13,7 @@ public class AddUserBadgeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.AddUserBadgeComposer); this.response.appendInt(this.badge.getId()); this.response.appendString(this.badge.getCode()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java index bc2089de..e451a884 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ChangeNameCheckResultComposer.java @@ -25,7 +25,7 @@ public class ChangeNameCheckResultComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UnknownComposer_2698); this.response.appendInt(this.status); this.response.appendString(this.name); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java index cfb5e4d9..b67608bd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ClubGiftReceivedComposer.java @@ -15,7 +15,7 @@ public class ClubGiftReceivedComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.ClubGiftReceivedComposer); this.response.appendInt(this.items.size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/FavoriteRoomsCountComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/FavoriteRoomsCountComposer.java index 57f7a586..36f4c4e5 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/FavoriteRoomsCountComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/FavoriteRoomsCountComposer.java @@ -15,7 +15,7 @@ public class FavoriteRoomsCountComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FavoriteRoomsCountComposer); this.response.appendInt(Emulator.getConfig().getInt("hotel.rooms.max.favorite")); this.response.appendInt(this.habbo.getHabboStats().getFavoriteRooms().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java index 48319066..73b2d1d9 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/MeMenuSettingsComposer.java @@ -13,7 +13,7 @@ public class MeMenuSettingsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MeMenuSettingsComposer); this.response.appendInt(this.habbo.getHabboStats().volumeSystem); this.response.appendInt(this.habbo.getHabboStats().volumeFurni); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java index 05cf873a..1db3310f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/MutedWhisperComposer.java @@ -12,7 +12,7 @@ public class MutedWhisperComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.MutedWhisperComposer); this.response.appendInt(this.seconds); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java index 4cae8211..cc4d757c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ProfileFriendsComposer.java @@ -57,7 +57,7 @@ public class ProfileFriendsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { try { this.response.init(Outgoing.ProfileFriendsComposer); this.response.appendInt(this.userId); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UpdateUserLookComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UpdateUserLookComposer.java index 5b536e02..ebe6f212 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UpdateUserLookComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UpdateUserLookComposer.java @@ -13,7 +13,7 @@ public class UpdateUserLookComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UpdateUserLookComposer); this.response.appendString(this.habbo.getHabboInfo().getLook()); this.response.appendString(this.habbo.getHabboInfo().getGender().name()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java index 8f7f7766..539481ab 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java @@ -13,7 +13,7 @@ public class UserAchievementScoreComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserAchievementScoreComposer); this.response.appendInt(this.habbo.getHabboStats().getAchievementScore()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserBCLimitsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserBCLimitsComposer.java index 30e1b895..3b745395 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserBCLimitsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserBCLimitsComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class UserBCLimitsComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserBCLimitsComposer); this.response.appendInt(0); this.response.appendInt(500); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java index e4e5d2ca..7574c3a6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserBadgesComposer.java @@ -17,7 +17,7 @@ public class UserBadgesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserBadgesComposer); this.response.appendInt(this.habbo); synchronized (this.badges) { diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java index b2f33c9b..cbaea5ba 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCitizinShipComposer.java @@ -12,7 +12,7 @@ public class UserCitizinShipComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserCitizinShipComposer); this.response.appendString(this.name); this.response.appendInt(4); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserClothesComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserClothesComposer.java index bc6ef47f..82c33e9f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserClothesComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserClothesComposer.java @@ -34,7 +34,7 @@ public class UserClothesComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserClothesComposer); this.response.appendInt(this.idList.size()); this.idList.forEach(this.response::appendInt); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java index eeb0724f..6e5f60bc 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserClubComposer.java @@ -14,7 +14,7 @@ public class UserClubComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserClubComposer); this.response.appendString("club_habbo"); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java index 5041b8ea..70c89ae6 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCreditsComposer.java @@ -13,7 +13,7 @@ public class UserCreditsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserCreditsComposer); this.response.appendString(this.habbo.getHabboInfo().getCredits() + ".0"); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java index d974ce80..22b689af 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java @@ -18,7 +18,7 @@ public class UserCurrencyComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserCurrencyComposer); String[] pointsTypes = Emulator.getConfig().getValue("seasonal.types").split(";"); this.response.appendInt(pointsTypes.length); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java index 5d5ed7e2..6b4235dd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserDataComposer.java @@ -13,7 +13,7 @@ public class UserDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserDataComposer); this.response.appendInt(this.habbo.getHabboInfo().getId()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java index ad324081..5ab9a8c3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserHomeRoomComposer.java @@ -14,7 +14,7 @@ public class UserHomeRoomComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserHomeRoomComposer); this.response.appendInt(this.homeRoom); this.response.appendInt(this.newRoom); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java index 508ad241..d8d3262d 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPerksComposer.java @@ -14,7 +14,7 @@ public class UserPerksComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserPerksComposer); this.response.appendInt(15); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java index 9dc9cb0b..4a0d13d4 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPermissionsComposer.java @@ -16,7 +16,7 @@ public class UserPermissionsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserPermissionsComposer); this.response.appendInt(this.clubLevel); this.response.appendInt(this.habbo.getHabboInfo().getRank().getLevel()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java index 6a158ad2..19ffa00c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserPointsComposer.java @@ -16,7 +16,7 @@ public class UserPointsComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserPointsComposer); this.response.appendInt(this.currentAmount); this.response.appendInt(this.amountAdded); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java index b2944ea8..7a535652 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserProfileComposer.java @@ -40,7 +40,7 @@ public class UserProfileComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { if (this.habboInfo == null) return null; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java index 562a2f09..912fab51 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/UserWardrobeComposer.java @@ -13,7 +13,7 @@ public class UserWardrobeComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.UserWardrobeComposer); this.response.appendInt(1); this.response.appendInt(this.wardrobeComponent.getLooks().size()); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java index 73b6983d..c763d4b1 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobileNumberComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class VerifyMobileNumberComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.VerifyMobileNumberComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java index 80561efc..f2923d4c 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneCodeWindowComposer.java @@ -14,7 +14,7 @@ public class VerifyMobilePhoneCodeWindowComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.VerifyMobilePhoneCodeWindowComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownInt2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java index 136a97ba..b91fca9f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneDoneComposer.java @@ -14,7 +14,7 @@ public class VerifyMobilePhoneDoneComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.VerifyMobilePhoneDoneComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownInt2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneWindowComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneWindowComposer.java index 85a31b5f..14766727 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneWindowComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/verification/VerifyMobilePhoneWindowComposer.java @@ -16,7 +16,7 @@ public class VerifyMobilePhoneWindowComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.VerifyMobilePhoneWindowComposer); this.response.appendInt(this.unknownInt1); this.response.appendInt(this.unknownInt2); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java index 71de8019..b3dcae0a 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredConditionDataComposer.java @@ -16,7 +16,7 @@ public class WiredConditionDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WiredConditionDataComposer); this.condition.serializeWiredData(this.response, this.room); this.condition.needsUpdate(true); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java index abd1923d..73c84f2f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredEffectDataComposer.java @@ -16,7 +16,7 @@ public class WiredEffectDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WiredEffectDataComposer); this.effect.serializeWiredData(this.response, this.room); this.effect.needsUpdate(true); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredOpenComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredOpenComposer.java index ea89b564..d433f637 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredOpenComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredOpenComposer.java @@ -13,7 +13,7 @@ public class WiredOpenComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WiredOpenComposer); this.response.appendInt(this.item.getId()); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java index 24f8965b..606a31eb 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredRewardAlertComposer.java @@ -22,7 +22,7 @@ public class WiredRewardAlertComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WiredRewardAlertComposer); this.response.appendInt(this.code); return this.response; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredSavedComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredSavedComposer.java index bfd12f61..17be832b 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredSavedComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredSavedComposer.java @@ -6,7 +6,7 @@ import com.eu.habbo.messages.outgoing.Outgoing; public class WiredSavedComposer extends MessageComposer { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WiredSavedComposer); return this.response; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java index abdb269f..8541e814 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/wired/WiredTriggerDataComposer.java @@ -16,7 +16,7 @@ public class WiredTriggerDataComposer extends MessageComposer { } @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.WiredTriggerDataComposer); this.trigger.serializeWiredData(this.response, this.room); this.trigger.needsUpdate(true); diff --git a/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java b/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java index 3b2f35c5..59d0bf3b 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java +++ b/src/main/java/com/eu/habbo/messages/rcon/FriendRequest.java @@ -33,7 +33,7 @@ public class FriendRequest extends RCONMessage { if (info != null) { target.getClient().sendResponse(new MessageComposer() { @Override - public ServerMessage compose() { + protected ServerMessage composeInternal() { this.response.init(Outgoing.FriendRequestComposer); this.response.appendInt(info.getId()); this.response.appendString(info.getUsername()); diff --git a/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java b/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java index a3a59dbd..ccb470e0 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java @@ -14,6 +14,7 @@ public class GameServerMessageEncoder extends MessageToByteEncoder Date: Sat, 9 May 2020 21:56:52 +0200 Subject: [PATCH 2/9] Add reliability to packets and actually clear the message buffer. --- .../com/eu/habbo/habbohotel/rooms/Room.java | 54 +++++++++++++------ .../eu/habbo/habbohotel/rooms/RoomTrade.java | 13 ++++- .../com/eu/habbo/messages/ServerMessage.java | 22 ++------ 3 files changed, 53 insertions(+), 36 deletions(-) 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 e0d51c01..5338ce24 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -3726,35 +3726,59 @@ public class Room implements Comparable, ISerialize, Runnable { } public void sendComposer(ServerMessage message) { - for (Habbo habbo : this.getHabbos()) { - if (habbo.getClient() == null) { - this.removeHabbo(habbo, true); - continue; - } + message.retain(); - habbo.getClient().sendResponse(message); + try { + for (Habbo habbo : this.getHabbos()) { + if (habbo.getClient() == null) { + this.removeHabbo(habbo, true); + continue; + } + + habbo.getClient().sendResponse(message); + } + } finally { + message.release(); } } public void sendComposerToHabbosWithRights(ServerMessage message) { - for (Habbo habbo : this.getHabbos()) { - if (this.hasRights(habbo)) { - habbo.getClient().sendResponse(message); + message.retain(); + + try { + for (Habbo habbo : this.getHabbos()) { + if (this.hasRights(habbo)) { + habbo.getClient().sendResponse(message); + } } + } finally { + message.release(); } } public void petChat(ServerMessage message) { - for (Habbo habbo : this.getHabbos()) { - if (!habbo.getHabboStats().ignorePets) - habbo.getClient().sendResponse(message); + message.retain(); + + try { + for (Habbo habbo : this.getHabbos()) { + if (!habbo.getHabboStats().ignorePets) + habbo.getClient().sendResponse(message); + } + } finally { + message.release(); } } public void botChat(ServerMessage message) { - for (Habbo habbo : this.getHabbos()) { - if (!habbo.getHabboStats().ignoreBots) - habbo.getClient().sendResponse(message); + message.retain(); + + try { + for (Habbo habbo : this.getHabbos()) { + if (!habbo.getHabboStats().ignoreBots) + habbo.getClient().sendResponse(message); + } + } finally { + message.release(); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java index c6ba64e0..3a443447 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java @@ -3,6 +3,7 @@ package com.eu.habbo.habbohotel.rooms; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; +import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; @@ -310,8 +311,16 @@ public class RoomTrade { } public void sendMessageToUsers(MessageComposer message) { - for (RoomTradeUser roomTradeUser : this.users) { - roomTradeUser.getHabbo().getClient().sendResponse(message); + ServerMessage messageComposed = message.compose(); + + messageComposed.retain(); + + try { + for (RoomTradeUser roomTradeUser : this.users) { + roomTradeUser.getHabbo().getClient().sendResponse(message); + } + } finally { + messageComposed.release(); } } diff --git a/src/main/java/com/eu/habbo/messages/ServerMessage.java b/src/main/java/com/eu/habbo/messages/ServerMessage.java index f43831d1..7a7e7c4f 100644 --- a/src/main/java/com/eu/habbo/messages/ServerMessage.java +++ b/src/main/java/com/eu/habbo/messages/ServerMessage.java @@ -1,6 +1,5 @@ package com.eu.habbo.messages; -import com.eu.habbo.util.DebugUtils; import com.eu.habbo.util.PacketUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; @@ -194,23 +193,13 @@ public class ServerMessage implements ReferenceCounted { @Override public ReferenceCounted retain() { - int result = this.refs.incrementAndGet(); - - if (this.header == 1167 || this.header == 2024 || this.header == 2505) { - System.out.printf("retain Packet: %d Count: %d From: %s%n", this.header, result, DebugUtils.getCallerCallerStacktrace()); - } - + this.refs.incrementAndGet(); return this; } @Override public ReferenceCounted retain(int i) { - int result = this.refs.addAndGet(i); - - if (this.header == 1167 || this.header == 2024 || this.header == 2505) { - System.out.printf("retain Packet: %d Count: %d From: %s%n", this.header, result, DebugUtils.getCallerCallerStacktrace()); - } - + this.refs.addAndGet(i); return this; } @@ -232,17 +221,12 @@ public class ServerMessage implements ReferenceCounted { @Override public boolean release(int i) { int value = this.refs.addAndGet(-i); - - if (this.header == 1167 || this.header == 2024 || this.header == 2505) { - System.out.printf("release Packet: %d Count: %d From: %s%n", this.header, value, DebugUtils.getCallerCallerStacktrace()); - } - if (value < 0) { throw new IllegalReferenceCountException("Decremented below 0 (packet " + this.header + " value " + value + ")."); } if (value == 0) { - this.channelBuffer.release(); + this.channelBuffer.release(this.channelBuffer.refCnt()); return true; } From a93ffbbbaca053c9c7ce8b8986ef3969afebc4ac Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Sat, 9 May 2020 22:41:43 +0200 Subject: [PATCH 3/9] Added debug. --- .../encoders/GameServerMessageEncoder.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java b/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java index ccb470e0..3b706fa6 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java @@ -4,18 +4,28 @@ import com.eu.habbo.messages.ServerMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; +import io.netty.util.IllegalReferenceCountException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class GameServerMessageEncoder extends MessageToByteEncoder { + private static final Logger LOGGER = LoggerFactory.getLogger(GameServerMessageEncoder.class); + @Override protected void encode(ChannelHandlerContext ctx, ServerMessage message, ByteBuf out) { - ByteBuf buf = message.get(); - try { - out.writeBytes(buf); - } finally { - // Release copied buffer. - buf.release(); + ByteBuf buf = message.get(); + + try { + out.writeBytes(buf); + } finally { + // Release copied buffer. + buf.release(); + } + } catch (IllegalReferenceCountException e) { + LOGGER.error("IllegalReferenceCountException happened for packet {}.", message.getHeader()); + throw e; } } From 4c140d940255992af2d69ff0799e3e4b9afa130b Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Sat, 9 May 2020 23:05:51 +0200 Subject: [PATCH 4/9] Fix more edge cases. --- .../com/eu/habbo/habbohotel/rooms/Room.java | 91 ++++++++++++------- .../encoders/GameServerMessageEncoder.java | 11 +-- 2 files changed, 60 insertions(+), 42 deletions(-) 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 5338ce24..85d108a3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -3120,40 +3120,73 @@ public class Room implements Comparable, ISerialize, Runnable { return; } - final ServerMessage message = new RoomUserWhisperComposer(roomChatMessage).compose(); RoomChatMessage staffChatMessage = new RoomChatMessage(roomChatMessage); staffChatMessage.setMessage("To " + staffChatMessage.getTargetHabbo().getHabboInfo().getUsername() + ": " + staffChatMessage.getMessage()); + + final ServerMessage message = new RoomUserWhisperComposer(roomChatMessage).compose(); final ServerMessage staffMessage = new RoomUserWhisperComposer(staffChatMessage).compose(); - for (Habbo h : this.getHabbos()) { - if (h == roomChatMessage.getTargetHabbo() || h == habbo) { - if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { - if (prefixMessage != null) { - h.getClient().sendResponse(prefixMessage); - } - h.getClient().sendResponse(message); + message.retain(); + staffMessage.retain(); - if (clearPrefixMessage != null) { - h.getClient().sendResponse(clearPrefixMessage); + try { + for (Habbo h : this.getHabbos()) { + if (h == roomChatMessage.getTargetHabbo() || h == habbo) { + if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { + if (prefixMessage != null) { + h.getClient().sendResponse(prefixMessage); + } + h.getClient().sendResponse(message); + + if (clearPrefixMessage != null) { + h.getClient().sendResponse(clearPrefixMessage); + } } + + continue; + } + if (h.hasPermission("acc_see_whispers")) { + h.getClient().sendResponse(staffMessage); } - - continue; - } - if (h.hasPermission("acc_see_whispers")) { - h.getClient().sendResponse(staffMessage); } + } finally { + message.release(); + staffMessage.release(); } } else if (chatType == RoomChatType.TALK) { ServerMessage message = new RoomUserTalkComposer(roomChatMessage).compose(); boolean noChatLimit = habbo.hasPermission("acc_chat_no_limit"); - for (Habbo h : this.getHabbos()) { - if ((h.getRoomUnit().getCurrentLocation().distance(habbo.getRoomUnit().getCurrentLocation()) <= this.chatDistance || - h.equals(habbo) || - this.hasRights(h) || - noChatLimit) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { - if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { + message.retain(); + + try { + for (Habbo h : this.getHabbos()) { + if ((h.getRoomUnit().getCurrentLocation().distance(habbo.getRoomUnit().getCurrentLocation()) <= this.chatDistance || + h.equals(habbo) || + this.hasRights(h) || + noChatLimit) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { + if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { + if (prefixMessage != null && !h.getHabboStats().preferOldChat) { + h.getClient().sendResponse(prefixMessage); + } + h.getClient().sendResponse(message); + if (clearPrefixMessage != null && !h.getHabboStats().preferOldChat) { + h.getClient().sendResponse(clearPrefixMessage); + } + } + } + } + } finally { + message.release(); + } + } else if (chatType == RoomChatType.SHOUT) { + ServerMessage message = new RoomUserShoutComposer(roomChatMessage).compose(); + + message.retain(); + + try { + for (Habbo h : this.getHabbos()) { + if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId()) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { if (prefixMessage != null && !h.getHabboStats().preferOldChat) { h.getClient().sendResponse(prefixMessage); } @@ -3163,20 +3196,8 @@ public class Room implements Comparable, ISerialize, Runnable { } } } - } - } else if (chatType == RoomChatType.SHOUT) { - ServerMessage message = new RoomUserShoutComposer(roomChatMessage).compose(); - - for (Habbo h : this.getHabbos()) { - if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId()) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { - if (prefixMessage != null && !h.getHabboStats().preferOldChat) { - h.getClient().sendResponse(prefixMessage); - } - h.getClient().sendResponse(message); - if (clearPrefixMessage != null && !h.getHabboStats().preferOldChat) { - h.getClient().sendResponse(clearPrefixMessage); - } - } + } finally { + message.release(); } } diff --git a/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java b/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java index 3b706fa6..51fdacf9 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageEncoder.java @@ -5,15 +5,13 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; import io.netty.util.IllegalReferenceCountException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import java.io.IOException; public class GameServerMessageEncoder extends MessageToByteEncoder { - private static final Logger LOGGER = LoggerFactory.getLogger(GameServerMessageEncoder.class); - @Override - protected void encode(ChannelHandlerContext ctx, ServerMessage message, ByteBuf out) { + protected void encode(ChannelHandlerContext ctx, ServerMessage message, ByteBuf out) throws Exception { try { ByteBuf buf = message.get(); @@ -24,8 +22,7 @@ public class GameServerMessageEncoder extends MessageToByteEncoder Date: Sun, 10 May 2020 00:02:46 +0200 Subject: [PATCH 5/9] Fix more issues. --- .../habbohotel/commands/EventCommand.java | 16 +++++++++---- .../habbohotel/commands/MassBadgeCommand.java | 22 ++++++++++------- .../habbohotel/commands/MassGiftCommand.java | 24 ++++++++++++------- .../habbo/messages/rcon/ImageHotelAlert.java | 15 ++++++++---- .../threading/runnables/CannonKickAction.java | 20 ++++++++++------ 5 files changed, 62 insertions(+), 35 deletions(-) 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 21d57835..270a3914 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EventCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EventCommand.java @@ -35,12 +35,18 @@ public class EventCommand extends Command { ServerMessage msg = new BubbleAlertComposer("hotel.event", codes).compose(); - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); - if (habbo.getHabboStats().blockStaffAlerts) - continue; + msg.retain(); - habbo.getClient().sendResponse(msg); + try { + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); + if (habbo.getHabboStats().blockStaffAlerts) + continue; + + habbo.getClient().sendResponse(msg); + } + } finally { + msg.release(); } return true; 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 b584ee61..44cd3c15 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassBadgeCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassBadgeCommand.java @@ -32,21 +32,25 @@ public class MassBadgeCommand extends Command { keys.put("image", "${image.library.url}album1584/" + badge + ".gif"); keys.put("message", Emulator.getTexts().getValue("commands.generic.cmd_badge.received")); ServerMessage message = new BubbleAlertComposer(BubbleAlertKeys.RECEIVED_BADGE.key, keys).compose(); + message.retain(); + try { + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); + if (habbo.isOnline()) { + if (habbo.getInventory() != null && habbo.getInventory().getBadgesComponent() != null && !habbo.getInventory().getBadgesComponent().hasBadge(badge)) { + HabboBadge b = BadgesComponent.createBadge(badge, habbo); - if (habbo.isOnline()) { - if (habbo.getInventory() != null && habbo.getInventory().getBadgesComponent() != null && !habbo.getInventory().getBadgesComponent().hasBadge(badge)) { - HabboBadge b = BadgesComponent.createBadge(badge, habbo); + if (b != null) { + habbo.getClient().sendResponse(new AddUserBadgeComposer(b)); - if (b != null) { - habbo.getClient().sendResponse(new AddUserBadgeComposer(b)); - - habbo.getClient().sendResponse(message); + habbo.getClient().sendResponse(message); + } } } } + } finally { + message.release(); } } return true; 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 1c1055b1..1610f7e9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassGiftCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassGiftCommand.java @@ -60,20 +60,26 @@ public class MassGiftCommand extends Command { ServerMessage giftNotificiationMessage = new BubbleAlertComposer(BubbleAlertKeys.RECEIVED_BADGE.key, keys).compose(); Emulator.getThreading().run(() -> { - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); + giftNotificiationMessage.retain(); - HabboItem item = Emulator.getGameEnvironment().getItemManager().createItem(0, baseItem, 0, 0, ""); + try { + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); - Item giftItem = Emulator.getGameEnvironment().getItemManager().getItem((Integer) Emulator.getGameEnvironment().getCatalogManager().giftFurnis.values().toArray()[Emulator.getRandom().nextInt(Emulator.getGameEnvironment().getCatalogManager().giftFurnis.size())]); + HabboItem item = Emulator.getGameEnvironment().getItemManager().createItem(0, baseItem, 0, 0, ""); - String extraData = "1\t" + item.getId(); - extraData += "\t0\t0\t0\t" + finalMessage + "\t0\t0"; + Item giftItem = Emulator.getGameEnvironment().getItemManager().getItem((Integer) Emulator.getGameEnvironment().getCatalogManager().giftFurnis.values().toArray()[Emulator.getRandom().nextInt(Emulator.getGameEnvironment().getCatalogManager().giftFurnis.size())]); - Emulator.getGameEnvironment().getItemManager().createGift(habbo.getHabboInfo().getUsername(), giftItem, extraData, 0, 0); + String extraData = "1\t" + item.getId(); + extraData += "\t0\t0\t0\t" + finalMessage + "\t0\t0"; - habbo.getClient().sendResponse(new InventoryRefreshComposer()); - habbo.getClient().sendResponse(giftNotificiationMessage); + Emulator.getGameEnvironment().getItemManager().createGift(habbo.getHabboInfo().getUsername(), giftItem, extraData, 0, 0); + + habbo.getClient().sendResponse(new InventoryRefreshComposer()); + habbo.getClient().sendResponse(giftNotificiationMessage); + } + } finally { + giftNotificiationMessage.release(); } }); diff --git a/src/main/java/com/eu/habbo/messages/rcon/ImageHotelAlert.java b/src/main/java/com/eu/habbo/messages/rcon/ImageHotelAlert.java index a2166745..8e162a41 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/ImageHotelAlert.java +++ b/src/main/java/com/eu/habbo/messages/rcon/ImageHotelAlert.java @@ -43,12 +43,17 @@ public class ImageHotelAlert extends RCONMessage { } ServerMessage message = new BubbleAlertComposer(json.bubble_key, keys).compose(); - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); - if (habbo.getHabboStats().blockStaffAlerts) - continue; + message.retain(); + try { + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); + if (habbo.getHabboStats().blockStaffAlerts) + continue; - habbo.getClient().sendResponse(message); + habbo.getClient().sendResponse(message); + } + } finally { + message.release(); } } diff --git a/src/main/java/com/eu/habbo/threading/runnables/CannonKickAction.java b/src/main/java/com/eu/habbo/threading/runnables/CannonKickAction.java index 65eff558..e1666301 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/CannonKickAction.java +++ b/src/main/java/com/eu/habbo/threading/runnables/CannonKickAction.java @@ -33,18 +33,24 @@ public class CannonKickAction implements Runnable { dater.put("title", "${notification.room.kick.cannonball.title}"); dater.put("message", "${notification.room.kick.cannonball.message}"); - ServerMessage message = new BubbleAlertComposer("cannon.png", dater).compose(); - int rotation = this.cannon.getRotation(); List tiles = this.room.getLayout().getTilesInFront(this.room.getLayout().getTile(this.cannon.getX(), this.cannon.getY()), rotation + 6, 3); - for (RoomTile t : tiles) { - for (Habbo habbo : this.room.getHabbosAt(t.x, t.y)) { - if (!habbo.hasPermission(Permission.ACC_UNKICKABLE) && !this.room.isOwner(habbo)) { - Emulator.getGameEnvironment().getRoomManager().leaveRoom(habbo, this.room); - habbo.getClient().sendResponse(message); //kicked composer + ServerMessage message = new BubbleAlertComposer("cannon.png", dater).compose(); + + message.retain(); + + try { + for (RoomTile t : tiles) { + for (Habbo habbo : this.room.getHabbosAt(t.x, t.y)) { + if (!habbo.hasPermission(Permission.ACC_UNKICKABLE) && !this.room.isOwner(habbo)) { + Emulator.getGameEnvironment().getRoomManager().leaveRoom(habbo, this.room); + habbo.getClient().sendResponse(message); //kicked composer + } } } + } finally { + message.release(); } } } From 46ff22f720293720bba593426c8c9c86596a7e77 Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Sun, 10 May 2020 00:11:56 +0200 Subject: [PATCH 6/9] Fix all last edge cases. --- .../commands/HotelAlertCommand.java | 17 ++- .../commands/ReloadRoomCommand.java | 9 +- .../gameclients/GameClientManager.java | 39 +++-- .../com/eu/habbo/habbohotel/rooms/Room.java | 136 ++++++++++-------- .../habbo/habbohotel/users/HabboManager.java | 11 +- .../FloorPlanEditorSaveEvent.java | 9 +- .../eu/habbo/messages/rcon/HotelAlert.java | 15 +- 7 files changed, 146 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java index 6be973a9..0d5bfdd1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java @@ -24,15 +24,18 @@ public class HotelAlertCommand extends Command { } ServerMessage msg = new StaffAlertWithLinkComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername(), "").compose(); + msg.retain(); + try { + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); + if (habbo.getHabboStats().blockStaffAlerts) + continue; - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); - if (habbo.getHabboStats().blockStaffAlerts) - continue; - - habbo.getClient().sendResponse(msg); + habbo.getClient().sendResponse(msg); + } + } finally { + msg.release(); } - } else { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_ha.forgot_message"), RoomChatMessageBubbles.ALERT); } 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 1ccd20d0..42c11e50 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java @@ -24,8 +24,13 @@ public class ReloadRoomCommand extends Command { Emulator.getGameEnvironment().getRoomManager().unloadRoom(room); room = Emulator.getGameEnvironment().getRoomManager().loadRoom(room.getId()); ServerMessage message = new ForwardToRoomComposer(room.getId()).compose(); - for (Habbo habbo : habbos) { - habbo.getClient().sendResponse(message); + message.retain(); + try { + for (Habbo habbo : habbos) { + habbo.getClient().sendResponse(message); + } + } finally { + message.release(); } } }, 100); diff --git a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java index ad9b28ff..dfbb7273 100644 --- a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java @@ -134,32 +134,47 @@ public class GameClientManager { public void sendBroadcastResponse(ServerMessage message) { - for (GameClient client : this.clients.values()) { - client.sendResponse(message); + message.retain(); + try { + for (GameClient client : this.clients.values()) { + client.sendResponse(message); + } + } finally { + message.release(); } } public void sendBroadcastResponse(ServerMessage message, GameClient exclude) { - for (GameClient client : this.clients.values()) { - if (client.equals(exclude)) - continue; + message.retain(); + try { + for (GameClient client : this.clients.values()) { + if (client.equals(exclude)) + continue; - client.sendResponse(message); + client.sendResponse(message); + } + } finally { + message.release(); } } public void sendBroadcastResponse(ServerMessage message, String minPermission, GameClient exclude) { - for (GameClient client : this.clients.values()) { - if (client.equals(exclude)) - continue; + message.retain(); + try { + for (GameClient client : this.clients.values()) { + if (client.equals(exclude)) + continue; - if (client.getHabbo() != null) { - if (client.getHabbo().hasPermission(minPermission)) { - client.sendResponse(message); + if (client.getHabbo() != null) { + if (client.getHabbo().hasPermission(minPermission)) { + client.sendResponse(message); + } } } + } finally { + message.release(); } } } \ No newline at end of file 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 85d108a3..ada54ce5 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -3115,57 +3115,87 @@ public class Room implements Comparable, ISerialize, Runnable { roomChatMessage.setMessage(trimmedMessage); - if (chatType == RoomChatType.WHISPER) { - if (roomChatMessage.getTargetHabbo() == null) { - return; - } + if (prefixMessage != null) { + prefixMessage.retain(); + } - RoomChatMessage staffChatMessage = new RoomChatMessage(roomChatMessage); - staffChatMessage.setMessage("To " + staffChatMessage.getTargetHabbo().getHabboInfo().getUsername() + ": " + staffChatMessage.getMessage()); + if (clearPrefixMessage != null) { + clearPrefixMessage.retain(); + } - final ServerMessage message = new RoomUserWhisperComposer(roomChatMessage).compose(); - final ServerMessage staffMessage = new RoomUserWhisperComposer(staffChatMessage).compose(); + try { + if (chatType == RoomChatType.WHISPER) { + if (roomChatMessage.getTargetHabbo() == null) { + return; + } - message.retain(); - staffMessage.retain(); + RoomChatMessage staffChatMessage = new RoomChatMessage(roomChatMessage); + staffChatMessage.setMessage("To " + staffChatMessage.getTargetHabbo().getHabboInfo().getUsername() + ": " + staffChatMessage.getMessage()); - try { - for (Habbo h : this.getHabbos()) { - if (h == roomChatMessage.getTargetHabbo() || h == habbo) { - if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { - if (prefixMessage != null) { - h.getClient().sendResponse(prefixMessage); + final ServerMessage message = new RoomUserWhisperComposer(roomChatMessage).compose(); + final ServerMessage staffMessage = new RoomUserWhisperComposer(staffChatMessage).compose(); + + message.retain(); + staffMessage.retain(); + + try { + for (Habbo h : this.getHabbos()) { + if (h == roomChatMessage.getTargetHabbo() || h == habbo) { + if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { + if (prefixMessage != null) { + h.getClient().sendResponse(prefixMessage); + } + h.getClient().sendResponse(message); + + if (clearPrefixMessage != null) { + h.getClient().sendResponse(clearPrefixMessage); + } } - h.getClient().sendResponse(message); - if (clearPrefixMessage != null) { - h.getClient().sendResponse(clearPrefixMessage); + continue; + } + if (h.hasPermission("acc_see_whispers")) { + h.getClient().sendResponse(staffMessage); + } + } + } finally { + message.release(); + staffMessage.release(); + } + } else if (chatType == RoomChatType.TALK) { + ServerMessage message = new RoomUserTalkComposer(roomChatMessage).compose(); + boolean noChatLimit = habbo.hasPermission("acc_chat_no_limit"); + + message.retain(); + + try { + for (Habbo h : this.getHabbos()) { + if ((h.getRoomUnit().getCurrentLocation().distance(habbo.getRoomUnit().getCurrentLocation()) <= this.chatDistance || + h.equals(habbo) || + this.hasRights(h) || + noChatLimit) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { + if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { + if (prefixMessage != null && !h.getHabboStats().preferOldChat) { + h.getClient().sendResponse(prefixMessage); + } + h.getClient().sendResponse(message); + if (clearPrefixMessage != null && !h.getHabboStats().preferOldChat) { + h.getClient().sendResponse(clearPrefixMessage); + } } } - - continue; - } - if (h.hasPermission("acc_see_whispers")) { - h.getClient().sendResponse(staffMessage); } + } finally { + message.release(); } - } finally { - message.release(); - staffMessage.release(); - } - } else if (chatType == RoomChatType.TALK) { - ServerMessage message = new RoomUserTalkComposer(roomChatMessage).compose(); - boolean noChatLimit = habbo.hasPermission("acc_chat_no_limit"); + } else if (chatType == RoomChatType.SHOUT) { + ServerMessage message = new RoomUserShoutComposer(roomChatMessage).compose(); - message.retain(); + message.retain(); - try { - for (Habbo h : this.getHabbos()) { - if ((h.getRoomUnit().getCurrentLocation().distance(habbo.getRoomUnit().getCurrentLocation()) <= this.chatDistance || - h.equals(habbo) || - this.hasRights(h) || - noChatLimit) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { - if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { + try { + for (Habbo h : this.getHabbos()) { + if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId()) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { if (prefixMessage != null && !h.getHabboStats().preferOldChat) { h.getClient().sendResponse(prefixMessage); } @@ -3175,29 +3205,17 @@ public class Room implements Comparable, ISerialize, Runnable { } } } + } finally { + message.release(); } - } finally { - message.release(); } - } else if (chatType == RoomChatType.SHOUT) { - ServerMessage message = new RoomUserShoutComposer(roomChatMessage).compose(); + } finally { + if (prefixMessage != null) { + prefixMessage.release(); + } - message.retain(); - - try { - for (Habbo h : this.getHabbos()) { - if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId()) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { - if (prefixMessage != null && !h.getHabboStats().preferOldChat) { - h.getClient().sendResponse(prefixMessage); - } - h.getClient().sendResponse(message); - if (clearPrefixMessage != null && !h.getHabboStats().preferOldChat) { - h.getClient().sendResponse(clearPrefixMessage); - } - } - } - } finally { - message.release(); + if (clearPrefixMessage != null) { + clearPrefixMessage.release(); } } 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 8975b888..f21e385f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java @@ -179,10 +179,15 @@ public class HabboManager { public void sendPacketToHabbosWithPermission(ServerMessage message, String perm) { synchronized (this.onlineHabbos) { - for (Habbo habbo : this.onlineHabbos.values()) { - if (habbo.hasPermission(perm)) { - habbo.getClient().sendResponse(message); + message.retain(); + try { + for (Habbo habbo : this.onlineHabbos.values()) { + if (habbo.hasPermission(perm)) { + habbo.getClient().sendResponse(message); + } } + } finally { + message.release(); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java index 113dd0e3..5f6279df 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java @@ -148,8 +148,13 @@ public class FloorPlanEditorSaveEvent extends MessageHandler { Emulator.getGameEnvironment().getRoomManager().unloadRoom(room); room = Emulator.getGameEnvironment().getRoomManager().loadRoom(room.getId()); ServerMessage message = new ForwardToRoomComposer(room.getId()).compose(); - for (Habbo habbo : habbos) { - habbo.getClient().sendResponse(message); + message.retain(); + try { + for (Habbo habbo : habbos) { + habbo.getClient().sendResponse(message); + } + } finally { + message.release(); } } } diff --git a/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java b/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java index 70989239..912c52e1 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java +++ b/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java @@ -25,12 +25,17 @@ public class HotelAlert extends RCONMessage { } if (serverMessage != null) { - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); - if (habbo.getHabboStats().blockStaffAlerts) - continue; + serverMessage.retain(); + try { + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); + if (habbo.getHabboStats().blockStaffAlerts) + continue; - habbo.getClient().sendResponse(serverMessage); + habbo.getClient().sendResponse(serverMessage); + } + } finally { + serverMessage.release(); } } } From ec3a7d8f5850515f5dd12ad59c8048fdcb6861f8 Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Sun, 10 May 2020 01:04:26 +0200 Subject: [PATCH 7/9] Fix crash when bot message is empty, increase max packet length. --- src/main/java/com/eu/habbo/habbohotel/rooms/Room.java | 4 ++++ .../networking/gameserver/decoders/GameByteFrameDecoder.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 ada54ce5..83ba308a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -3809,6 +3809,10 @@ public class Room implements Comparable, ISerialize, Runnable { } public void botChat(ServerMessage message) { + if (message == null) { + return; + } + message.retain(); try { diff --git a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java index 82e60ed4..67778018 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java @@ -6,7 +6,7 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder; public class GameByteFrameDecoder extends LengthFieldBasedFrameDecoder { - private static final int MAX_PACKET_LENGTH = 8192 * 4; + private static final int MAX_PACKET_LENGTH = 8192 * 16; private static final int LENGTH_FIELD_OFFSET = 0; private static final int LENGTH_FIELD_LENGTH = 4; private static final int LENGTH_FIELD_ADJUSTMENT = 0; From 40818513aa8b3eb48e27710fc02543d06989c3f3 Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Sun, 10 May 2020 19:18:39 +0200 Subject: [PATCH 8/9] Fix packet length. --- .../gameserver/decoders/GameByteFrameDecoder.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java index 67778018..f902a3c6 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java @@ -6,7 +6,13 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder; public class GameByteFrameDecoder extends LengthFieldBasedFrameDecoder { - private static final int MAX_PACKET_LENGTH = 8192 * 16; + /** + * MAX_PACKET_LENGTH is based on the maximum camera PNG size. + * Source: https://superuser.com/a/759030 + * Maximum camera packet is 320 * 320 Pixel * 4 Bytes per Pixel = 409600. + * Adding some for overhead 409600 + 8192 = 417792 + */ + private static final int MAX_PACKET_LENGTH = 417792; private static final int LENGTH_FIELD_OFFSET = 0; private static final int LENGTH_FIELD_LENGTH = 4; private static final int LENGTH_FIELD_ADJUSTMENT = 0; From 492c8f61422af713994a02a8446d9bd10423438d Mon Sep 17 00:00:00 2001 From: Mike <76-Mike@users.noreply.git.krews.org> Date: Wed, 13 May 2020 20:55:07 +0200 Subject: [PATCH 9/9] Revert ServerMessage release/retain. --- .../habbohotel/commands/EventCommand.java | 16 +- .../commands/HotelAlertCommand.java | 16 +- .../habbohotel/commands/MassBadgeCommand.java | 22 +- .../habbohotel/commands/MassGiftCommand.java | 24 +- .../commands/ReloadRoomCommand.java | 9 +- .../habbohotel/gameclients/GameClient.java | 4 +- .../gameclients/GameClientManager.java | 39 +--- .../com/eu/habbo/habbohotel/rooms/Room.java | 214 +++++++----------- .../eu/habbo/habbohotel/rooms/RoomTrade.java | 13 +- .../habbo/habbohotel/users/HabboManager.java | 11 +- .../com/eu/habbo/messages/ServerMessage.java | 52 +---- .../FloorPlanEditorSaveEvent.java | 9 +- .../eu/habbo/messages/rcon/HotelAlert.java | 15 +- .../habbo/messages/rcon/ImageHotelAlert.java | 16 +- .../networking/gameserver/GameServer.java | 3 - .../decoders/GameMessageHandler.java | 9 +- .../encoders/GameServerMessageLogger.java | 2 +- .../threading/runnables/CannonKickAction.java | 16 +- 18 files changed, 148 insertions(+), 342 deletions(-) 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 270a3914..21d57835 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/EventCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/EventCommand.java @@ -35,18 +35,12 @@ public class EventCommand extends Command { ServerMessage msg = new BubbleAlertComposer("hotel.event", codes).compose(); - msg.retain(); + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); + if (habbo.getHabboStats().blockStaffAlerts) + continue; - try { - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); - if (habbo.getHabboStats().blockStaffAlerts) - continue; - - habbo.getClient().sendResponse(msg); - } - } finally { - msg.release(); + habbo.getClient().sendResponse(msg); } return true; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java index 0d5bfdd1..52a3d454 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/HotelAlertCommand.java @@ -24,17 +24,13 @@ public class HotelAlertCommand extends Command { } ServerMessage msg = new StaffAlertWithLinkComposer(message + "\r\n-" + gameClient.getHabbo().getHabboInfo().getUsername(), "").compose(); - msg.retain(); - try { - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); - if (habbo.getHabboStats().blockStaffAlerts) - continue; - habbo.getClient().sendResponse(msg); - } - } finally { - msg.release(); + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); + if (habbo.getHabboStats().blockStaffAlerts) + continue; + + habbo.getClient().sendResponse(msg); } } else { gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.error.cmd_ha.forgot_message"), RoomChatMessageBubbles.ALERT); 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 44cd3c15..b584ee61 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassBadgeCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassBadgeCommand.java @@ -32,25 +32,21 @@ public class MassBadgeCommand extends Command { keys.put("image", "${image.library.url}album1584/" + badge + ".gif"); keys.put("message", Emulator.getTexts().getValue("commands.generic.cmd_badge.received")); ServerMessage message = new BubbleAlertComposer(BubbleAlertKeys.RECEIVED_BADGE.key, keys).compose(); - message.retain(); - try { - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); - if (habbo.isOnline()) { - if (habbo.getInventory() != null && habbo.getInventory().getBadgesComponent() != null && !habbo.getInventory().getBadgesComponent().hasBadge(badge)) { - HabboBadge b = BadgesComponent.createBadge(badge, habbo); + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); - if (b != null) { - habbo.getClient().sendResponse(new AddUserBadgeComposer(b)); + if (habbo.isOnline()) { + if (habbo.getInventory() != null && habbo.getInventory().getBadgesComponent() != null && !habbo.getInventory().getBadgesComponent().hasBadge(badge)) { + HabboBadge b = BadgesComponent.createBadge(badge, habbo); - habbo.getClient().sendResponse(message); - } + if (b != null) { + habbo.getClient().sendResponse(new AddUserBadgeComposer(b)); + + habbo.getClient().sendResponse(message); } } } - } finally { - message.release(); } } return true; 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 1610f7e9..1c1055b1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/MassGiftCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/MassGiftCommand.java @@ -60,26 +60,20 @@ public class MassGiftCommand extends Command { ServerMessage giftNotificiationMessage = new BubbleAlertComposer(BubbleAlertKeys.RECEIVED_BADGE.key, keys).compose(); Emulator.getThreading().run(() -> { - giftNotificiationMessage.retain(); + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); - try { - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); + HabboItem item = Emulator.getGameEnvironment().getItemManager().createItem(0, baseItem, 0, 0, ""); - HabboItem item = Emulator.getGameEnvironment().getItemManager().createItem(0, baseItem, 0, 0, ""); + Item giftItem = Emulator.getGameEnvironment().getItemManager().getItem((Integer) Emulator.getGameEnvironment().getCatalogManager().giftFurnis.values().toArray()[Emulator.getRandom().nextInt(Emulator.getGameEnvironment().getCatalogManager().giftFurnis.size())]); - Item giftItem = Emulator.getGameEnvironment().getItemManager().getItem((Integer) Emulator.getGameEnvironment().getCatalogManager().giftFurnis.values().toArray()[Emulator.getRandom().nextInt(Emulator.getGameEnvironment().getCatalogManager().giftFurnis.size())]); + String extraData = "1\t" + item.getId(); + extraData += "\t0\t0\t0\t" + finalMessage + "\t0\t0"; - String extraData = "1\t" + item.getId(); - extraData += "\t0\t0\t0\t" + finalMessage + "\t0\t0"; + Emulator.getGameEnvironment().getItemManager().createGift(habbo.getHabboInfo().getUsername(), giftItem, extraData, 0, 0); - Emulator.getGameEnvironment().getItemManager().createGift(habbo.getHabboInfo().getUsername(), giftItem, extraData, 0, 0); - - habbo.getClient().sendResponse(new InventoryRefreshComposer()); - habbo.getClient().sendResponse(giftNotificiationMessage); - } - } finally { - giftNotificiationMessage.release(); + habbo.getClient().sendResponse(new InventoryRefreshComposer()); + habbo.getClient().sendResponse(giftNotificiationMessage); } }); 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 42c11e50..1ccd20d0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/ReloadRoomCommand.java @@ -24,13 +24,8 @@ public class ReloadRoomCommand extends Command { Emulator.getGameEnvironment().getRoomManager().unloadRoom(room); room = Emulator.getGameEnvironment().getRoomManager().loadRoom(room.getId()); ServerMessage message = new ForwardToRoomComposer(room.getId()).compose(); - message.retain(); - try { - for (Habbo habbo : habbos) { - habbo.getClient().sendResponse(message); - } - } finally { - message.release(); + for (Habbo habbo : habbos) { + habbo.getClient().sendResponse(message); } } }, 100); diff --git a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClient.java b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClient.java index 4242467d..9f871543 100644 --- a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClient.java +++ b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClient.java @@ -96,7 +96,7 @@ public class GameClient { return; } - this.channel.write(response.retain(), this.channel.voidPromise()); + this.channel.write(response, this.channel.voidPromise()); this.channel.flush(); } } @@ -108,7 +108,7 @@ public class GameClient { return; } - this.channel.write(response.retain()); + this.channel.write(response); } this.channel.flush(); diff --git a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java index dfbb7273..ad9b28ff 100644 --- a/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/gameclients/GameClientManager.java @@ -134,47 +134,32 @@ public class GameClientManager { public void sendBroadcastResponse(ServerMessage message) { - message.retain(); - try { - for (GameClient client : this.clients.values()) { - client.sendResponse(message); - } - } finally { - message.release(); + for (GameClient client : this.clients.values()) { + client.sendResponse(message); } } public void sendBroadcastResponse(ServerMessage message, GameClient exclude) { - message.retain(); - try { - for (GameClient client : this.clients.values()) { - if (client.equals(exclude)) - continue; + for (GameClient client : this.clients.values()) { + if (client.equals(exclude)) + continue; - client.sendResponse(message); - } - } finally { - message.release(); + client.sendResponse(message); } } public void sendBroadcastResponse(ServerMessage message, String minPermission, GameClient exclude) { - message.retain(); - try { - for (GameClient client : this.clients.values()) { - if (client.equals(exclude)) - continue; + for (GameClient client : this.clients.values()) { + if (client.equals(exclude)) + continue; - if (client.getHabbo() != null) { - if (client.getHabbo().hasPermission(minPermission)) { - client.sendResponse(message); - } + if (client.getHabbo() != null) { + if (client.getHabbo().hasPermission(minPermission)) { + client.sendResponse(message); } } - } finally { - message.release(); } } } \ No newline at end of file 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 83ba308a..483744f3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -3115,107 +3115,69 @@ public class Room implements Comparable, ISerialize, Runnable { roomChatMessage.setMessage(trimmedMessage); - if (prefixMessage != null) { - prefixMessage.retain(); - } - - if (clearPrefixMessage != null) { - clearPrefixMessage.retain(); - } - - try { - if (chatType == RoomChatType.WHISPER) { - if (roomChatMessage.getTargetHabbo() == null) { - return; - } - - RoomChatMessage staffChatMessage = new RoomChatMessage(roomChatMessage); - staffChatMessage.setMessage("To " + staffChatMessage.getTargetHabbo().getHabboInfo().getUsername() + ": " + staffChatMessage.getMessage()); - - final ServerMessage message = new RoomUserWhisperComposer(roomChatMessage).compose(); - final ServerMessage staffMessage = new RoomUserWhisperComposer(staffChatMessage).compose(); - - message.retain(); - staffMessage.retain(); - - try { - for (Habbo h : this.getHabbos()) { - if (h == roomChatMessage.getTargetHabbo() || h == habbo) { - if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { - if (prefixMessage != null) { - h.getClient().sendResponse(prefixMessage); - } - h.getClient().sendResponse(message); - - if (clearPrefixMessage != null) { - h.getClient().sendResponse(clearPrefixMessage); - } - } - - continue; - } - if (h.hasPermission("acc_see_whispers")) { - h.getClient().sendResponse(staffMessage); - } - } - } finally { - message.release(); - staffMessage.release(); - } - } else if (chatType == RoomChatType.TALK) { - ServerMessage message = new RoomUserTalkComposer(roomChatMessage).compose(); - boolean noChatLimit = habbo.hasPermission("acc_chat_no_limit"); - - message.retain(); - - try { - for (Habbo h : this.getHabbos()) { - if ((h.getRoomUnit().getCurrentLocation().distance(habbo.getRoomUnit().getCurrentLocation()) <= this.chatDistance || - h.equals(habbo) || - this.hasRights(h) || - noChatLimit) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { - if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { - if (prefixMessage != null && !h.getHabboStats().preferOldChat) { - h.getClient().sendResponse(prefixMessage); - } - h.getClient().sendResponse(message); - if (clearPrefixMessage != null && !h.getHabboStats().preferOldChat) { - h.getClient().sendResponse(clearPrefixMessage); - } - } - } - } - } finally { - message.release(); - } - } else if (chatType == RoomChatType.SHOUT) { - ServerMessage message = new RoomUserShoutComposer(roomChatMessage).compose(); - - message.retain(); - - try { - for (Habbo h : this.getHabbos()) { - if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId()) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { - if (prefixMessage != null && !h.getHabboStats().preferOldChat) { - h.getClient().sendResponse(prefixMessage); - } - h.getClient().sendResponse(message); - if (clearPrefixMessage != null && !h.getHabboStats().preferOldChat) { - h.getClient().sendResponse(clearPrefixMessage); - } - } - } - } finally { - message.release(); - } - } - } finally { - if (prefixMessage != null) { - prefixMessage.release(); + if (chatType == RoomChatType.WHISPER) { + if (roomChatMessage.getTargetHabbo() == null) { + return; } - if (clearPrefixMessage != null) { - clearPrefixMessage.release(); + RoomChatMessage staffChatMessage = new RoomChatMessage(roomChatMessage); + staffChatMessage.setMessage("To " + staffChatMessage.getTargetHabbo().getHabboInfo().getUsername() + ": " + staffChatMessage.getMessage()); + + final ServerMessage message = new RoomUserWhisperComposer(roomChatMessage).compose(); + final ServerMessage staffMessage = new RoomUserWhisperComposer(staffChatMessage).compose(); + + for (Habbo h : this.getHabbos()) { + if (h == roomChatMessage.getTargetHabbo() || h == habbo) { + if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { + if (prefixMessage != null) { + h.getClient().sendResponse(prefixMessage); + } + h.getClient().sendResponse(message); + + if (clearPrefixMessage != null) { + h.getClient().sendResponse(clearPrefixMessage); + } + } + + continue; + } + if (h.hasPermission("acc_see_whispers")) { + h.getClient().sendResponse(staffMessage); + } + } + } else if (chatType == RoomChatType.TALK) { + ServerMessage message = new RoomUserTalkComposer(roomChatMessage).compose(); + boolean noChatLimit = habbo.hasPermission("acc_chat_no_limit"); + + for (Habbo h : this.getHabbos()) { + if ((h.getRoomUnit().getCurrentLocation().distance(habbo.getRoomUnit().getCurrentLocation()) <= this.chatDistance || + h.equals(habbo) || + this.hasRights(h) || + noChatLimit) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { + if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId())) { + if (prefixMessage != null && !h.getHabboStats().preferOldChat) { + h.getClient().sendResponse(prefixMessage); + } + h.getClient().sendResponse(message); + if (clearPrefixMessage != null && !h.getHabboStats().preferOldChat) { + h.getClient().sendResponse(clearPrefixMessage); + } + } + } + } + } else if (chatType == RoomChatType.SHOUT) { + ServerMessage message = new RoomUserShoutComposer(roomChatMessage).compose(); + + for (Habbo h : this.getHabbos()) { + if (!h.getHabboStats().userIgnored(habbo.getHabboInfo().getId()) && (show == null || RoomLayout.tileInSquare(show, h.getRoomUnit().getCurrentLocation()))) { + if (prefixMessage != null && !h.getHabboStats().preferOldChat) { + h.getClient().sendResponse(prefixMessage); + } + h.getClient().sendResponse(message); + if (clearPrefixMessage != null && !h.getHabboStats().preferOldChat) { + h.getClient().sendResponse(clearPrefixMessage); + } + } } } @@ -3765,46 +3727,28 @@ public class Room implements Comparable, ISerialize, Runnable { } public void sendComposer(ServerMessage message) { - message.retain(); - - try { - for (Habbo habbo : this.getHabbos()) { - if (habbo.getClient() == null) { - this.removeHabbo(habbo, true); - continue; - } - - habbo.getClient().sendResponse(message); + for (Habbo habbo : this.getHabbos()) { + if (habbo.getClient() == null) { + this.removeHabbo(habbo, true); + continue; } - } finally { - message.release(); + + habbo.getClient().sendResponse(message); } } public void sendComposerToHabbosWithRights(ServerMessage message) { - message.retain(); - - try { - for (Habbo habbo : this.getHabbos()) { - if (this.hasRights(habbo)) { - habbo.getClient().sendResponse(message); - } + for (Habbo habbo : this.getHabbos()) { + if (this.hasRights(habbo)) { + habbo.getClient().sendResponse(message); } - } finally { - message.release(); } } public void petChat(ServerMessage message) { - message.retain(); - - try { - for (Habbo habbo : this.getHabbos()) { - if (!habbo.getHabboStats().ignorePets) - habbo.getClient().sendResponse(message); - } - } finally { - message.release(); + for (Habbo habbo : this.getHabbos()) { + if (!habbo.getHabboStats().ignorePets) + habbo.getClient().sendResponse(message); } } @@ -3813,15 +3757,9 @@ public class Room implements Comparable, ISerialize, Runnable { return; } - message.retain(); - - try { - for (Habbo habbo : this.getHabbos()) { - if (!habbo.getHabboStats().ignoreBots) - habbo.getClient().sendResponse(message); - } - } finally { - message.release(); + for (Habbo habbo : this.getHabbos()) { + if (!habbo.getHabboStats().ignoreBots) + habbo.getClient().sendResponse(message); } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java index 3a443447..c6ba64e0 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTrade.java @@ -3,7 +3,6 @@ package com.eu.habbo.habbohotel.rooms; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; @@ -311,16 +310,8 @@ public class RoomTrade { } public void sendMessageToUsers(MessageComposer message) { - ServerMessage messageComposed = message.compose(); - - messageComposed.retain(); - - try { - for (RoomTradeUser roomTradeUser : this.users) { - roomTradeUser.getHabbo().getClient().sendResponse(message); - } - } finally { - messageComposed.release(); + for (RoomTradeUser roomTradeUser : this.users) { + roomTradeUser.getHabbo().getClient().sendResponse(message); } } 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 f21e385f..8975b888 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboManager.java @@ -179,15 +179,10 @@ public class HabboManager { public void sendPacketToHabbosWithPermission(ServerMessage message, String perm) { synchronized (this.onlineHabbos) { - message.retain(); - try { - for (Habbo habbo : this.onlineHabbos.values()) { - if (habbo.hasPermission(perm)) { - habbo.getClient().sendResponse(message); - } + for (Habbo habbo : this.onlineHabbos.values()) { + if (habbo.hasPermission(perm)) { + habbo.getClient().sendResponse(message); } - } finally { - message.release(); } } } diff --git a/src/main/java/com/eu/habbo/messages/ServerMessage.java b/src/main/java/com/eu/habbo/messages/ServerMessage.java index 7a7e7c4f..8754ce5c 100644 --- a/src/main/java/com/eu/habbo/messages/ServerMessage.java +++ b/src/main/java/com/eu/habbo/messages/ServerMessage.java @@ -4,15 +4,13 @@ import com.eu.habbo.util.PacketUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; import io.netty.buffer.Unpooled; -import io.netty.util.IllegalReferenceCountException; -import io.netty.util.ReferenceCounted; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; -public class ServerMessage implements ReferenceCounted { +public class ServerMessage { private static final Logger LOGGER = LoggerFactory.getLogger(ServerMessage.class); private boolean initialized; @@ -35,6 +33,7 @@ public class ServerMessage implements ReferenceCounted { throw new ServerMessageException("ServerMessage was already initialized."); } + this.initialized = true; this.header = id; this.refs = new AtomicInteger(0); this.channelBuffer = Unpooled.buffer(); @@ -186,51 +185,4 @@ public class ServerMessage implements ReferenceCounted { return this.channelBuffer.copy(); } - @Override - public int refCnt() { - return this.refs.get(); - } - - @Override - public ReferenceCounted retain() { - this.refs.incrementAndGet(); - return this; - } - - @Override - public ReferenceCounted retain(int i) { - this.refs.addAndGet(i); - return this; - } - - @Override - public ReferenceCounted touch() { - return this; - } - - @Override - public ReferenceCounted touch(Object o) { - return this; - } - - @Override - public boolean release() { - return this.release(1); - } - - @Override - public boolean release(int i) { - int value = this.refs.addAndGet(-i); - if (value < 0) { - throw new IllegalReferenceCountException("Decremented below 0 (packet " + this.header + " value " + value + ")."); - } - - if (value == 0) { - this.channelBuffer.release(this.channelBuffer.refCnt()); - return true; - } - - return false; - } - } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java index 5f6279df..113dd0e3 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/floorplaneditor/FloorPlanEditorSaveEvent.java @@ -148,13 +148,8 @@ public class FloorPlanEditorSaveEvent extends MessageHandler { Emulator.getGameEnvironment().getRoomManager().unloadRoom(room); room = Emulator.getGameEnvironment().getRoomManager().loadRoom(room.getId()); ServerMessage message = new ForwardToRoomComposer(room.getId()).compose(); - message.retain(); - try { - for (Habbo habbo : habbos) { - habbo.getClient().sendResponse(message); - } - } finally { - message.release(); + for (Habbo habbo : habbos) { + habbo.getClient().sendResponse(message); } } } diff --git a/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java b/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java index 912c52e1..70989239 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java +++ b/src/main/java/com/eu/habbo/messages/rcon/HotelAlert.java @@ -25,17 +25,12 @@ public class HotelAlert extends RCONMessage { } if (serverMessage != null) { - serverMessage.retain(); - try { - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); - if (habbo.getHabboStats().blockStaffAlerts) - continue; + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); + if (habbo.getHabboStats().blockStaffAlerts) + continue; - habbo.getClient().sendResponse(serverMessage); - } - } finally { - serverMessage.release(); + habbo.getClient().sendResponse(serverMessage); } } } diff --git a/src/main/java/com/eu/habbo/messages/rcon/ImageHotelAlert.java b/src/main/java/com/eu/habbo/messages/rcon/ImageHotelAlert.java index 8e162a41..d392a6b2 100644 --- a/src/main/java/com/eu/habbo/messages/rcon/ImageHotelAlert.java +++ b/src/main/java/com/eu/habbo/messages/rcon/ImageHotelAlert.java @@ -43,17 +43,13 @@ public class ImageHotelAlert extends RCONMessage { } ServerMessage message = new BubbleAlertComposer(json.bubble_key, keys).compose(); - message.retain(); - try { - for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { - Habbo habbo = set.getValue(); - if (habbo.getHabboStats().blockStaffAlerts) - continue; - habbo.getClient().sendResponse(message); - } - } finally { - message.release(); + for (Map.Entry set : Emulator.getGameEnvironment().getHabboManager().getOnlineHabbos().entrySet()) { + Habbo habbo = set.getValue(); + if (habbo.getHabboStats().blockStaffAlerts) + continue; + + habbo.getClient().sendResponse(message); } } diff --git a/src/main/java/com/eu/habbo/networking/gameserver/GameServer.java b/src/main/java/com/eu/habbo/networking/gameserver/GameServer.java index bbd2f4bf..90514484 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/GameServer.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/GameServer.java @@ -30,9 +30,6 @@ public class GameServer extends Server { public void initChannel(SocketChannel ch) throws Exception { ch.pipeline().addLast("logger", new LoggingHandler()); - // Logger. - - // Decoders. ch.pipeline().addLast(new GamePolicyDecoder()); ch.pipeline().addLast(new GameByteFrameDecoder()); diff --git a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameMessageHandler.java b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameMessageHandler.java index a0ba3112..2da3032e 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameMessageHandler.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameMessageHandler.java @@ -63,14 +63,7 @@ public class GameMessageHandler extends ChannelInboundHandlerAdapter { if (cause instanceof TooLongFrameException) { LOGGER.error("Disconnecting client, reason: \"" + cause.getMessage() + "\"."); } else { - cause.printStackTrace(); - - LOGGER.error("Disconnecting client, exception in GameMessageHander:"); - LOGGER.error(cause.toString()); - - for (StackTraceElement element : cause.getStackTrace()) { - LOGGER.error(element.toString()); - } + LOGGER.error("Disconnecting client, exception in GameMessageHander.", cause); } ctx.channel().close(); diff --git a/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageLogger.java b/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageLogger.java index a21edde9..fd351942 100644 --- a/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageLogger.java +++ b/src/main/java/com/eu/habbo/networking/gameserver/encoders/GameServerMessageLogger.java @@ -27,7 +27,7 @@ public class GameServerMessageLogger extends MessageToMessageEncoder