Merge branch '559-timestamp' into 'dev'

feat(HabboStats): update last catalogue purchase

See merge request morningstar/Arcturus-Community!118
This commit is contained in:
skeletor 2020-04-29 05:22:26 -04:00
commit d00c436930
4 changed files with 13 additions and 3 deletions

View File

@ -1 +1,3 @@
INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('hotel.room.stickies.max', '200'); INSERT INTO `emulator_settings`(`key`, `value`) VALUES ('hotel.room.stickies.max', '200');
ALTER TABLE `users_settings` ADD COLUMN `last_purchase_timestamp` int(11) NOT NULL DEFAULT UNIX_TIMESTAMP();

View File

@ -1124,6 +1124,8 @@ public class CatalogManager {
habbo.getClient().sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR)); habbo.getClient().sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR));
} }
} finally { } finally {
habbo.getHabboStats().lastPurchaseTimestamp = Emulator.getIntUnixTimestamp();
habbo.getHabboStats().run();
habbo.getHabboStats().isPurchasingFurniture = false; habbo.getHabboStats().isPurchasingFurniture = false;
} }
} }

View File

@ -78,7 +78,7 @@ public class HabboStats implements Runnable {
public int forumPostsCount; public int forumPostsCount;
public THashMap<Integer, List<Integer>> ltdPurchaseLog = new THashMap<>(0); public THashMap<Integer, List<Integer>> ltdPurchaseLog = new THashMap<>(0);
public long lastTradeTimestamp = Emulator.getIntUnixTimestamp(); public long lastTradeTimestamp = Emulator.getIntUnixTimestamp();
public long lastPurchaseTimestamp = Emulator.getIntUnixTimestamp(); public int lastPurchaseTimestamp;
public long lastGiftTimestamp = Emulator.getIntUnixTimestamp(); public long lastGiftTimestamp = Emulator.getIntUnixTimestamp();
public int uiFlags; public int uiFlags;
public boolean hasGottenDefaultSavedSearches; public boolean hasGottenDefaultSavedSearches;
@ -135,6 +135,8 @@ public class HabboStats implements Runnable {
this.forumPostsCount = set.getInt("forums_post_count"); this.forumPostsCount = set.getInt("forums_post_count");
this.uiFlags = set.getInt("ui_flags"); this.uiFlags = set.getInt("ui_flags");
this.hasGottenDefaultSavedSearches = set.getInt("has_gotten_default_saved_searches") == 1; this.hasGottenDefaultSavedSearches = set.getInt("has_gotten_default_saved_searches") == 1;
this.lastPurchaseTimestamp = set.getInt("last_purchase_timestamp");
this.nuxReward = this.nux; this.nuxReward = this.nux;
try (PreparedStatement statement = set.getStatement().getConnection().prepareStatement("SELECT * FROM user_window_settings WHERE user_id = ? LIMIT 1")) { try (PreparedStatement statement = set.getStatement().getConnection().prepareStatement("SELECT * FROM user_window_settings WHERE user_id = ? LIMIT 1")) {
@ -294,7 +296,7 @@ public class HabboStats implements Runnable {
@Override @Override
public void run() { public void run() {
try (Connection connection = Emulator.getDatabase().getDataSource().getConnection()) { try (Connection connection = Emulator.getDatabase().getDataSource().getConnection()) {
try (PreparedStatement statement = connection.prepareStatement("UPDATE users_settings SET achievement_score = ?, respects_received = ?, respects_given = ?, daily_respect_points = ?, block_following = ?, block_friendrequests = ?, online_time = online_time + ?, guild_id = ?, daily_pet_respect_points = ?, club_expire_timestamp = ?, login_streak = ?, rent_space_id = ?, rent_space_endtime = ?, volume_system = ?, volume_furni = ?, volume_trax = ?, block_roominvites = ?, old_chat = ?, block_camera_follow = ?, chat_color = ?, hof_points = ?, block_alerts = ?, talent_track_citizenship_level = ?, talent_track_helpers_level = ?, ignore_bots = ?, ignore_pets = ?, nux = ?, mute_end_timestamp = ?, allow_name_change = ?, perk_trade = ?, can_trade = ?, `forums_post_count` = ?, ui_flags = ?, has_gotten_default_saved_searches = ? WHERE user_id = ? LIMIT 1")) { try (PreparedStatement statement = connection.prepareStatement("UPDATE users_settings SET achievement_score = ?, respects_received = ?, respects_given = ?, daily_respect_points = ?, block_following = ?, block_friendrequests = ?, online_time = online_time + ?, guild_id = ?, daily_pet_respect_points = ?, club_expire_timestamp = ?, login_streak = ?, rent_space_id = ?, rent_space_endtime = ?, volume_system = ?, volume_furni = ?, volume_trax = ?, block_roominvites = ?, old_chat = ?, block_camera_follow = ?, chat_color = ?, hof_points = ?, block_alerts = ?, talent_track_citizenship_level = ?, talent_track_helpers_level = ?, ignore_bots = ?, ignore_pets = ?, nux = ?, mute_end_timestamp = ?, allow_name_change = ?, perk_trade = ?, can_trade = ?, `forums_post_count` = ?, ui_flags = ?, has_gotten_default_saved_searches = ?, last_purchase_timestamp = ? WHERE user_id = ? LIMIT 1")) {
statement.setInt(1, this.achievementScore); statement.setInt(1, this.achievementScore);
statement.setInt(2, this.respectPointsReceived); statement.setInt(2, this.respectPointsReceived);
statement.setInt(3, this.respectPointsGiven); statement.setInt(3, this.respectPointsGiven);
@ -329,8 +331,10 @@ public class HabboStats implements Runnable {
statement.setInt(32, this.forumPostsCount); statement.setInt(32, this.forumPostsCount);
statement.setInt(33, this.uiFlags); statement.setInt(33, this.uiFlags);
statement.setInt(34, this.hasGottenDefaultSavedSearches ? 1 : 0); statement.setInt(34, this.hasGottenDefaultSavedSearches ? 1 : 0);
statement.setInt(35, this.lastPurchaseTimestamp);
statement.setInt(36, this.habboInfo.getId());
statement.setInt(35, this.habboInfo.getId());
statement.executeUpdate(); statement.executeUpdate();
} }

View File

@ -177,6 +177,8 @@ public class CatalogBuyItemEvent extends MessageHandler {
this.client.sendResponse(new PurchaseOKComposer(null)); this.client.sendResponse(new PurchaseOKComposer(null));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new InventoryRefreshComposer());
this.client.getHabbo().getHabboStats().lastPurchaseTimestamp = Emulator.getIntUnixTimestamp();
this.client.getHabbo().getHabboStats().run(); this.client.getHabbo().getHabboStats().run();
} }
return; return;