From 7a8a2f42eed156af7f8856a703b90ada77d9fcf9 Mon Sep 17 00:00:00 2001 From: brenoepic <59066707+brenoepics@users.noreply.github.com> Date: Thu, 28 Apr 2022 23:44:24 -0300 Subject: [PATCH] Refactor methods to reduce its Cognitive Complexity --- .../eu/habbo/habbohotel/GameEnvironment.java | 2 +- .../{calendar => }/CalendarCampaign.java | 29 ++++---- .../{calendar => }/CalendarManager.java | 71 ++++++++----------- .../{calendar => }/CalendarRewardClaimed.java | 2 +- .../{calendar => }/CalendarRewardObject.java | 2 +- .../habbohotel/commands/CalendarCommand.java | 2 +- .../com/eu/habbo/habbohotel/rooms/Room.java | 2 +- .../eu/habbo/habbohotel/users/HabboStats.java | 2 +- .../com/eu/habbo/messages/PacketManager.java | 4 +- .../eu/habbo/messages/incoming/Incoming.java | 4 +- .../OpenCampaignCalendarDoorAsStaffEvent.java | 7 +- .../OpenCampaignCalendarDoorEvent.java | 6 +- .../incoming/handshake/SSOTicketEvent.java | 2 +- .../CampaignCalendarDataMessageComposer.java | 2 +- ...aignCalendarDoorOpenedMessageComposer.java | 4 +- .../users/calendar/UserClaimRewardEvent.java | 4 +- 16 files changed, 68 insertions(+), 77 deletions(-) rename src/main/java/com/eu/habbo/habbohotel/campaign/{calendar => }/CalendarCampaign.java (62%) rename src/main/java/com/eu/habbo/habbohotel/campaign/{calendar => }/CalendarManager.java (62%) rename src/main/java/com/eu/habbo/habbohotel/campaign/{calendar => }/CalendarRewardClaimed.java (96%) rename src/main/java/com/eu/habbo/habbohotel/campaign/{calendar => }/CalendarRewardObject.java (98%) rename src/main/java/com/eu/habbo/messages/incoming/{events/calendar => campaign}/OpenCampaignCalendarDoorAsStaffEvent.java (75%) rename src/main/java/com/eu/habbo/messages/incoming/{events/calendar => campaign}/OpenCampaignCalendarDoorEvent.java (75%) diff --git a/src/main/java/com/eu/habbo/habbohotel/GameEnvironment.java b/src/main/java/com/eu/habbo/habbohotel/GameEnvironment.java index 7944ae8c..ba201e53 100644 --- a/src/main/java/com/eu/habbo/habbohotel/GameEnvironment.java +++ b/src/main/java/com/eu/habbo/habbohotel/GameEnvironment.java @@ -4,7 +4,7 @@ import com.eu.habbo.Emulator; import com.eu.habbo.core.*; import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.bots.BotManager; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarManager; +import com.eu.habbo.habbohotel.campaign.CalendarManager; import com.eu.habbo.habbohotel.catalog.CatalogManager; import com.eu.habbo.habbohotel.commands.CommandHandler; import com.eu.habbo.habbohotel.crafting.CraftingManager; diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarCampaign.java b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarCampaign.java similarity index 62% rename from src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarCampaign.java rename to src/main/java/com/eu/habbo/habbohotel/campaign/CalendarCampaign.java index 29733ddb..4fc4a5b9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarCampaign.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarCampaign.java @@ -1,10 +1,9 @@ -package com.eu.habbo.habbohotel.campaign.calendar; +package com.eu.habbo.habbohotel.campaign; import gnu.trove.map.hash.THashMap; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Timestamp; import java.util.Map; public class CalendarCampaign { @@ -12,26 +11,26 @@ public class CalendarCampaign { private final String name; private final String image; private Map rewards = new THashMap<>(); - private final Integer start_timestamp; - private final int total_days; - private final boolean lock_expired; + private final Integer startTimestamp; + private final int totalDays; + private final boolean lockExpired; public CalendarCampaign(ResultSet set) throws SQLException { this.id = set.getInt("id"); this.name = set.getString("name"); this.image = set.getString("image"); - this.start_timestamp = set.getInt("start_timestamp"); - this.total_days = set.getInt("total_days"); - this.lock_expired = set.getInt("lock_expired") == 1; + this.startTimestamp = set.getInt("start_timestamp"); + this.totalDays = set.getInt("total_days"); + this.lockExpired = set.getInt("lock_expired") == 1; } - public CalendarCampaign(int id, String name, String image, Integer start_timestamp, int total_days, boolean lock_expired) { + public CalendarCampaign(int id, String name, String image, Integer startTimestamp, int totalDays, boolean lockExpired) { this.id = id; this.name = name; this.image = image; - this.start_timestamp = start_timestamp; - this.total_days = total_days; - this.lock_expired = lock_expired; + this.startTimestamp = startTimestamp; + this.totalDays = totalDays; + this.lockExpired = lockExpired; } public int getId() { @@ -47,12 +46,12 @@ public class CalendarCampaign { } public Integer getStartTimestamp() { - return this.start_timestamp; + return this.startTimestamp; } - public int getTotalDays() { return this.total_days; } + public int getTotalDays() { return this.totalDays; } - public boolean getLockExpired() { return this.lock_expired; } + public boolean getLockExpired() { return this.lockExpired; } public Map getRewards() { return rewards; } diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarManager.java similarity index 62% rename from src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java rename to src/main/java/com/eu/habbo/habbohotel/campaign/CalendarManager.java index 73f435bf..cf0beded 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarManager.java @@ -1,4 +1,4 @@ -package com.eu.habbo.habbohotel.campaign.calendar; +package com.eu.habbo.habbohotel.campaign; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; @@ -9,16 +9,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.sql.*; -import java.util.*; +import java.time.temporal.ChronoUnit; import java.util.Date; - -import static java.time.temporal.ChronoUnit.DAYS; +import java.util.*; public class CalendarManager { - private static final Logger LOGGER = LoggerFactory.getLogger(CalendarCampaign.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CalendarManager.class); - final private static Map calendarCampaigns = new THashMap<>(); + private static final Map calendarCampaigns = new THashMap<>(); public static double HC_MODIFIER; public CalendarManager() { @@ -27,7 +26,7 @@ public class CalendarManager { LOGGER.info("Calendar Manager -> Loaded! ({} MS)", (System.currentTimeMillis() - millis)); } - public void dispose(){ + public void dispose() { calendarCampaigns.clear(); } @@ -48,7 +47,7 @@ public class CalendarManager { try (ResultSet set = statement.executeQuery()) { while (set.next()) { CalendarCampaign campaign = calendarCampaigns.get(set.getInt("campaign_id")); - if(campaign != null){ + if (campaign != null) { campaign.addReward(new CalendarRewardObject(set)); } } @@ -58,7 +57,7 @@ public class CalendarManager { return false; } - HC_MODIFIER = Emulator.getConfig().getDouble("hotel.calendar.pixels.hc_modifier", 2.0); + CalendarManager.HC_MODIFIER = Emulator.getConfig().getDouble("hotel.calendar.pixels.hc_modifier", 2.0); return true; } @@ -107,46 +106,38 @@ public class CalendarManager { public CalendarCampaign getCalendarCampaign(String campaignName) { return calendarCampaigns.values().stream().filter(cc -> Objects.equals(cc.getName(), campaignName)).findFirst().orElse(null); } + public Map getCalendarCampaigns() { return calendarCampaigns; } public void claimCalendarReward(Habbo habbo, String campaignName, int day, boolean force) { CalendarCampaign campaign = calendarCampaigns.values().stream().filter(cc -> Objects.equals(cc.getName(), campaignName)).findFirst().orElse(null); - if(campaign == null) return; - if (habbo.getHabboStats().calendarRewardsClaimed.stream().noneMatch(claimed -> claimed.getCampaignId() == campaign.getId() && claimed.getDay() == day)) { + if (campaign == null || campaign.getRewards().isEmpty() || (habbo.getHabboStats().calendarRewardsClaimed.stream().anyMatch(claimed -> claimed.getCampaignId() == campaign.getId() && claimed.getDay() == day))) + return; - Set keys = campaign.getRewards().keySet(); - Map rewards = new THashMap<>(); - if(keys.isEmpty()) return; - keys.forEach(key -> rewards.put(rewards.size() + 1, key)); - int rand = Emulator.getRandom().nextInt(rewards.size() - 1 + 1) + 1; - int random = rewards.get(rand); - CalendarRewardObject object = campaign.getRewards().get(random); - if (object == null) return; - int daysBetween = (int) DAYS.between(new Timestamp(campaign.getStartTimestamp() * 1000L).toInstant(), new Date().toInstant()); - if(daysBetween >= 0 && daysBetween <= campaign.getTotalDays()) { - int diff = (daysBetween - day); - if ((((diff <= 2 || !campaign.getLockExpired()) && diff >= 0) || (force && habbo.hasPermission("acc_calendar_force")))) { + List rewards = new ArrayList<>(campaign.getRewards().values()); + CalendarRewardObject object = rewards.get(Emulator.getRandom().nextInt(rewards.size() - 1 + 1)); - if (Emulator.getPluginManager().fireEvent(new UserClaimRewardEvent(habbo, campaign, day, object, force)).isCancelled()) { - return; - } + if (object == null) return; + long daysBetween = ChronoUnit.DAYS.between(new Timestamp(campaign.getStartTimestamp() * 1000L).toInstant(), new Date().toInstant()); + if (((daysBetween >= 0 && daysBetween <= campaign.getTotalDays()) && (((daysBetween - day <= 2 || !campaign.getLockExpired()) && daysBetween - day >= 0)) || (force && habbo.hasPermission("acc_calendar_force")))) { + if (Emulator.getPluginManager().fireEvent(new UserClaimRewardEvent(habbo, campaign, day, object, force)).isCancelled()) { + return; + } + habbo.getHabboStats().calendarRewardsClaimed.add(new CalendarRewardClaimed(habbo.getHabboInfo().getId(), campaign.getId(), day, object.getId(), new Timestamp(System.currentTimeMillis()))); + habbo.getClient().sendResponse(new CampaignCalendarDoorOpenedMessageComposer(true, object, habbo)); + object.give(habbo); - habbo.getHabboStats().calendarRewardsClaimed.add(new CalendarRewardClaimed(habbo.getHabboInfo().getId(), campaign.getId(), day, object.getId(), new Timestamp(System.currentTimeMillis()))); - habbo.getClient().sendResponse(new CampaignCalendarDoorOpenedMessageComposer(true, object, habbo)); - object.give(habbo); - try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO calendar_rewards_claimed (user_id, campaign_id, day, reward_id, timestamp) VALUES (?, ?, ?, ?, ?)")) { - statement.setInt(1, habbo.getHabboInfo().getId()); - statement.setInt(2, campaign.getId()); - statement.setInt(3, day); - statement.setInt(4, object.getId()); - statement.setInt(5, Emulator.getIntUnixTimestamp()); - statement.execute(); - } catch (SQLException e) { - LOGGER.error("Caught SQL exception", e); - } - } + try (Connection connection = Emulator.getDatabase().getDataSource().getConnection(); PreparedStatement statement = connection.prepareStatement("INSERT INTO calendar_rewards_claimed (user_id, campaign_id, day, reward_id, timestamp) VALUES (?, ?, ?, ?, ?)")) { + statement.setInt(1, habbo.getHabboInfo().getId()); + statement.setInt(2, campaign.getId()); + statement.setInt(3, day); + statement.setInt(4, object.getId()); + statement.setInt(5, Emulator.getIntUnixTimestamp()); + statement.execute(); + } catch (SQLException e) { + LOGGER.error("Caught SQL exception", e); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardClaimed.java similarity index 96% rename from src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java rename to src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardClaimed.java index 7b6a1837..96f0c0d9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardClaimed.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardClaimed.java @@ -1,4 +1,4 @@ -package com.eu.habbo.habbohotel.campaign.calendar; +package com.eu.habbo.habbohotel.campaign; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardObject.java similarity index 98% rename from src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java rename to src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardObject.java index 49693f4c..90f92e6b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/campaign/calendar/CalendarRewardObject.java +++ b/src/main/java/com/eu/habbo/habbohotel/campaign/CalendarRewardObject.java @@ -1,4 +1,4 @@ -package com.eu.habbo.habbohotel.campaign.calendar; +package com.eu.habbo.habbohotel.campaign; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.Item; diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java index 0732c15b..d1a06d2a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java +++ b/src/main/java/com/eu/habbo/habbohotel/commands/CalendarCommand.java @@ -1,7 +1,7 @@ package com.eu.habbo.habbohotel.commands; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarCampaign; +import com.eu.habbo.habbohotel.campaign.CalendarCampaign; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.messages.outgoing.events.calendar.CampaignCalendarDataMessageComposer; import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer; 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 b67f5ba2..3ffc601f 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -4168,7 +4168,7 @@ public class Room implements Comparable, ISerialize, Runnable { } public void giveEffect(RoomUnit roomUnit, int effectId, int duration) { - if (roomUnit == null) return; + if (roomUnit == null || roomUnit.getRoom() == null) return; Habbo habbo = roomUnit.getRoom().getHabbo(roomUnit); diff --git a/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java b/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java index 4d2c8ed1..855d4972 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/HabboStats.java @@ -1,7 +1,7 @@ package com.eu.habbo.habbohotel.users; import com.eu.habbo.Emulator; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarRewardClaimed; +import com.eu.habbo.habbohotel.campaign.CalendarRewardClaimed; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.achievements.Achievement; import com.eu.habbo.habbohotel.achievements.AchievementManager; diff --git a/src/main/java/com/eu/habbo/messages/PacketManager.java b/src/main/java/com/eu/habbo/messages/PacketManager.java index 5559da79..830149bf 100644 --- a/src/main/java/com/eu/habbo/messages/PacketManager.java +++ b/src/main/java/com/eu/habbo/messages/PacketManager.java @@ -9,6 +9,8 @@ import com.eu.habbo.messages.incoming.achievements.GetAchievementsEvent; import com.eu.habbo.messages.incoming.ambassadors.AmbassadorAlertEvent; import com.eu.habbo.messages.incoming.ambassadors.FollowFriendEvent; import com.eu.habbo.messages.incoming.camera.*; +import com.eu.habbo.messages.incoming.campaign.OpenCampaignCalendarDoorAsStaffEvent; +import com.eu.habbo.messages.incoming.campaign.OpenCampaignCalendarDoorEvent; import com.eu.habbo.messages.incoming.catalog.*; import com.eu.habbo.messages.incoming.catalog.marketplace.*; import com.eu.habbo.messages.incoming.catalog.recycler.PresentOpenEvent; @@ -16,8 +18,6 @@ import com.eu.habbo.messages.incoming.catalog.recycler.RecycleItemsEvent; import com.eu.habbo.messages.incoming.catalog.recycler.GetRecyclerStatusEvent; import com.eu.habbo.messages.incoming.catalog.recycler.GetRecyclerPrizesEvent; import com.eu.habbo.messages.incoming.crafting.*; -import com.eu.habbo.messages.incoming.events.calendar.OpenCampaignCalendarDoorEvent; -import com.eu.habbo.messages.incoming.events.calendar.OpenCampaignCalendarDoorAsStaffEvent; import com.eu.habbo.messages.incoming.floorplaneditor.GetOccupiedTilesEvent; import com.eu.habbo.messages.incoming.floorplaneditor.GetRoomEntryTileEvent; import com.eu.habbo.messages.incoming.floorplaneditor.UpdateFloorPropertiesEvent; diff --git a/src/main/java/com/eu/habbo/messages/incoming/Incoming.java b/src/main/java/com/eu/habbo/messages/incoming/Incoming.java index b6f99ae9..0469f513 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/Incoming.java +++ b/src/main/java/com/eu/habbo/messages/incoming/Incoming.java @@ -232,8 +232,8 @@ public class Incoming { public static final int NewNavigatorSearchEvent = 249; public static final int NewUserExperienceGetGiftsEvent = 1822; public static final int NewUserExperienceScriptProceedEvent = 1299; - public static final int OpenCampaignCalendarDoorAsStaffEvent = 2257; - public static final int OpenCampaignCalendarDoorEvent = 3889; + public static final int OpenCampaignCalendarDoorEvent = 8809; + public static final int OpenCampaignCalendarDoorAsStaffEvent = 2507; public static final int OpenFlatConnectionEvent = 2312; public static final int OpenPetPackageEvent = 3698; public static final int OpenTradingEvent = 1481; diff --git a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorAsStaffEvent.java b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java similarity index 75% rename from src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorAsStaffEvent.java rename to src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java index 7922228d..03e4dc47 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorAsStaffEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorAsStaffEvent.java @@ -1,4 +1,4 @@ -package com.eu.habbo.messages.incoming.events.calendar; +package com.eu.habbo.messages.incoming.campaign; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; @@ -9,6 +9,7 @@ public class OpenCampaignCalendarDoorAsStaffEvent extends MessageHandler { String campaignName = this.packet.readString(); int day = this.packet.readInt(); - Emulator.getGameEnvironment().getCalendarManager().claimCalendarReward(this.client.getHabbo(), campaignName, day, false); + Emulator.getGameEnvironment().getCalendarManager().claimCalendarReward(this.client.getHabbo(), campaignName, day, true); } -} \ No newline at end of file +} + diff --git a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorEvent.java b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java similarity index 75% rename from src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorEvent.java rename to src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java index 1cf7505f..cb66ae3b 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/events/calendar/OpenCampaignCalendarDoorEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/campaign/OpenCampaignCalendarDoorEvent.java @@ -1,4 +1,4 @@ -package com.eu.habbo.messages.incoming.events.calendar; +package com.eu.habbo.messages.incoming.campaign; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; @@ -9,6 +9,6 @@ public class OpenCampaignCalendarDoorEvent extends MessageHandler { String campaignName = this.packet.readString(); int day = this.packet.readInt(); - Emulator.getGameEnvironment().getCalendarManager().claimCalendarReward(this.client.getHabbo(), campaignName, day, true); + Emulator.getGameEnvironment().getCalendarManager().claimCalendarReward(this.client.getHabbo(), campaignName, day, false); } -} \ No newline at end of file +} diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java index 0ed19b3d..016b493d 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/SSOTicketEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.handshake; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarCampaign; +import com.eu.habbo.habbohotel.campaign.CalendarCampaign; import com.eu.habbo.habbohotel.catalog.TargetOffer; import com.eu.habbo.habbohotel.messenger.Messenger; import com.eu.habbo.habbohotel.modtool.ModToolSanctionItem; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java index 7154b4dc..635f75ce 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDataMessageComposer.java @@ -1,6 +1,6 @@ package com.eu.habbo.messages.outgoing.events.calendar; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarRewardClaimed; +import com.eu.habbo.habbohotel.campaign.CalendarRewardClaimed; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java index 8f46b07c..49b6ba58 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/calendar/CampaignCalendarDoorOpenedMessageComposer.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.outgoing.events.calendar; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarManager; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarRewardObject; +import com.eu.habbo.habbohotel.campaign.CalendarManager; +import com.eu.habbo.habbohotel.campaign.CalendarRewardObject; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; diff --git a/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java b/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java index c57f60db..e63e8383 100644 --- a/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java +++ b/src/main/java/com/eu/habbo/plugin/events/users/calendar/UserClaimRewardEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.plugin.events.users.calendar; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarCampaign; -import com.eu.habbo.habbohotel.campaign.calendar.CalendarRewardObject; +import com.eu.habbo.habbohotel.campaign.CalendarCampaign; +import com.eu.habbo.habbohotel.campaign.CalendarRewardObject; import com.eu.habbo.habbohotel.users.Habbo; import com.eu.habbo.plugin.events.users.UserEvent;