diff options
author | Shauren <shauren.trinity@gmail.com> | 2021-04-05 23:47:05 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-04-05 23:47:05 +0200 |
commit | d29dd1eeb5c52dc76bd741fe1ee0e875c416b8e7 (patch) | |
tree | 19b4dda1de5bee6f3d45a3472f131380443365d4 /src/server/game | |
parent | c648ac58e0a0724a6eff0242afaf665443f675ef (diff) |
Core/Misc: Change all unix time columns in character database to bigint (signed)
Diffstat (limited to 'src/server/game')
24 files changed, 118 insertions, 116 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 7e60de8b1cc..21d52ecd0fa 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -249,7 +249,7 @@ void PlayerAchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, Pre continue; CompletedAchievementData& ca = _completedAchievements[achievementid]; - ca.Date = time_t(fields[1].GetUInt32()); + ca.Date = fields[1].GetInt64(); ca.Changed = false; _achievementPoints += achievement->Points; @@ -271,7 +271,7 @@ void PlayerAchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, Pre Field* fields = criteriaResult->Fetch(); uint32 id = fields[0].GetUInt32(); uint64 counter = fields[1].GetUInt64(); - time_t date = time_t(fields[2].GetUInt32()); + time_t date = fields[2].GetInt64(); Criteria const* criteria = sCriteriaMgr->GetCriteria(id); if (!criteria) @@ -315,7 +315,7 @@ void PlayerAchievementMgr::SaveToDB(CharacterDatabaseTransaction& trans) stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHAR_ACHIEVEMENT); stmt->setUInt64(0, _owner->GetGUID().GetCounter()); stmt->setUInt32(1, iter->first); - stmt->setUInt32(2, uint32(iter->second.Date)); + stmt->setInt64(2, iter->second.Date); trans->Append(stmt); iter->second.Changed = false; @@ -340,7 +340,7 @@ void PlayerAchievementMgr::SaveToDB(CharacterDatabaseTransaction& trans) stmt->setUInt64(0, _owner->GetGUID().GetCounter()); stmt->setUInt32(1, iter->first); stmt->setUInt64(2, iter->second.Counter); - stmt->setUInt32(3, uint32(iter->second.Date)); + stmt->setInt64(3, iter->second.Date); trans->Append(stmt); } @@ -738,7 +738,7 @@ void GuildAchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, Prep continue; CompletedAchievementData& ca = _completedAchievements[achievementid]; - ca.Date = time_t(fields[1].GetUInt32()); + ca.Date = fields[1].GetInt64(); Tokenizer guids(fields[2].GetString(), ' '); for (uint32 i = 0; i < guids.size(); ++i) ca.CompletingPlayers.insert(ObjectGuid::Create<HighGuid::Player>(uint64(strtoull(guids[i], nullptr, 10)))); @@ -757,7 +757,7 @@ void GuildAchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, Prep Field* fields = criteriaResult->Fetch(); uint32 id = fields[0].GetUInt32(); uint64 counter = fields[1].GetUInt64(); - time_t date = time_t(fields[2].GetUInt32()); + time_t date = fields[2].GetInt64(); ObjectGuid::LowType guid = fields[3].GetUInt64(); Criteria const* criteria = sCriteriaMgr->GetCriteria(id); @@ -801,7 +801,7 @@ void GuildAchievementMgr::SaveToDB(CharacterDatabaseTransaction& trans) stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GUILD_ACHIEVEMENT); stmt->setUInt64(0, _owner->GetId()); stmt->setUInt32(1, itr->first); - stmt->setUInt32(2, uint32(itr->second.Date)); + stmt->setInt64(2, itr->second.Date); for (GuidSet::const_iterator gItr = itr->second.CompletingPlayers.begin(); gItr != itr->second.CompletingPlayers.end(); ++gItr) guidstr << gItr->GetCounter() << ','; @@ -825,7 +825,7 @@ void GuildAchievementMgr::SaveToDB(CharacterDatabaseTransaction& trans) stmt->setUInt64(0, _owner->GetId()); stmt->setUInt32(1, itr->first); stmt->setUInt64(2, itr->second.Counter); - stmt->setUInt32(3, uint32(itr->second.Date)); + stmt->setInt64(3, itr->second.Date); stmt->setUInt64(4, itr->second.PlayerGUID.GetCounter()); trans->Append(stmt); } diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 3d7079ed5a4..015f124cfae 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -625,8 +625,8 @@ void AuctionHouseMgr::LoadAuctions() auction.BuyoutOrUnitPrice = fields[5].GetUInt64(); auction.Deposit = fields[6].GetUInt64(); auction.BidAmount = fields[7].GetUInt64(); - auction.StartTime = std::chrono::system_clock::from_time_t(fields[8].GetUInt32()); - auction.EndTime = std::chrono::system_clock::from_time_t(fields[9].GetUInt32()); + auction.StartTime = std::chrono::system_clock::from_time_t(fields[8].GetInt64()); + auction.EndTime = std::chrono::system_clock::from_time_t(fields[9].GetInt64()); auto biddersItr = biddersByAuction.find(auction.Id); if (biddersItr != biddersByAuction.end()) @@ -998,8 +998,8 @@ void AuctionHouseObject::AddAuction(CharacterDatabaseTransaction trans, AuctionP stmt->setUInt64(5, auction.BuyoutOrUnitPrice); stmt->setUInt64(6, auction.Deposit); stmt->setUInt64(7, auction.BidAmount); - stmt->setUInt32(8, uint32(std::chrono::system_clock::to_time_t(auction.StartTime))); - stmt->setUInt32(9, uint32(std::chrono::system_clock::to_time_t(auction.EndTime))); + stmt->setInt64(8, std::chrono::system_clock::to_time_t(auction.StartTime)); + stmt->setInt64(9, std::chrono::system_clock::to_time_t(auction.EndTime)); trans->Append(stmt); for (Item* item : auction.Items) diff --git a/src/server/game/BlackMarket/BlackMarketMgr.cpp b/src/server/game/BlackMarket/BlackMarketMgr.cpp index 0798d46501b..4b0395da208 100644 --- a/src/server/game/BlackMarket/BlackMarketMgr.cpp +++ b/src/server/game/BlackMarket/BlackMarketMgr.cpp @@ -431,7 +431,7 @@ bool BlackMarketEntry::LoadFromDB(Field* fields) } _currentBid = fields[1].GetUInt64(); - _secondsRemaining = static_cast<time_t>(fields[2].GetInt32()) - sBlackMarketMgr->GetLastUpdate(); + _secondsRemaining = static_cast<time_t>(fields[2].GetInt64()) - sBlackMarketMgr->GetLastUpdate(); _numBids = fields[3].GetInt32(); _bidder = fields[4].GetUInt64(); @@ -451,7 +451,7 @@ void BlackMarketEntry::SaveToDB(CharacterDatabaseTransaction& trans) const stmt->setInt32(0, _marketId); stmt->setUInt64(1, _currentBid); - stmt->setInt32(2, GetExpirationTime()); + stmt->setInt64(2, GetExpirationTime()); stmt->setInt32(3, _numBids); stmt->setUInt64(4, _bidder); @@ -498,7 +498,7 @@ void BlackMarketEntry::PlaceBid(uint64 bid, Player* player, CharacterDatabaseTra CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_BLACKMARKET_AUCTIONS); stmt->setUInt64(0, _currentBid); - stmt->setInt32(1, GetExpirationTime()); + stmt->setInt64(1, GetExpirationTime()); stmt->setInt32(2, _numBids); stmt->setUInt64(3, _bidder); stmt->setInt32(4, _marketId); diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index cc957cb9995..3aa43bb0cfc 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -75,15 +75,15 @@ void CalendarMgr::LoadFromDB() std::string description = fields[3].GetString(); CalendarEventType type = CalendarEventType(fields[4].GetUInt8()); int32 textureID = fields[5].GetInt32(); - uint32 date = fields[6].GetUInt32(); + time_t date = fields[6].GetInt64(); uint32 flags = fields[7].GetUInt32(); - uint32 lockDate = fields[8].GetUInt32(); + time_t lockDate = fields[8].GetInt64(); ObjectGuid::LowType guildID = UI64LIT(0); if (flags & CALENDAR_FLAG_GUILD_EVENT || flags & CALENDAR_FLAG_WITHOUT_INVITES) guildID = sCharacterCache->GetCharacterGuildIdByGuid(ownerGUID); - CalendarEvent* calendarEvent = new CalendarEvent(eventID, ownerGUID, guildID, type, textureID, time_t(date), flags, title, description, time_t(lockDate)); + CalendarEvent* calendarEvent = new CalendarEvent(eventID, ownerGUID, guildID, type, textureID, date, flags, title, description, lockDate); _events.insert(calendarEvent); _maxEventId = std::max(_maxEventId, eventID); @@ -107,11 +107,11 @@ void CalendarMgr::LoadFromDB() ObjectGuid invitee = ObjectGuid::Create<HighGuid::Player>(fields[2].GetUInt64()); ObjectGuid senderGUID = ObjectGuid::Create<HighGuid::Player>(fields[3].GetUInt64()); CalendarInviteStatus status = CalendarInviteStatus(fields[4].GetUInt8()); - uint32 responseTime = fields[5].GetUInt32(); + time_t responseTime = fields[5].GetInt64(); CalendarModerationRank rank = CalendarModerationRank(fields[6].GetUInt8()); std::string note = fields[7].GetString(); - CalendarInvite* invite = new CalendarInvite(inviteId, eventId, invitee, senderGUID, time_t(responseTime), status, rank, note); + CalendarInvite* invite = new CalendarInvite(inviteId, eventId, invitee, senderGUID, responseTime, status, rank, note); _invites[eventId].push_back(invite); _maxInviteId = std::max(_maxInviteId, inviteId); @@ -246,9 +246,9 @@ void CalendarMgr::UpdateEvent(CalendarEvent* calendarEvent) stmt->setString(3, calendarEvent->GetDescription()); stmt->setUInt8(4, calendarEvent->GetType()); stmt->setInt32(5, calendarEvent->GetTextureId()); - stmt->setUInt32(6, uint32(calendarEvent->GetDate())); + stmt->setInt64(6, calendarEvent->GetDate()); stmt->setUInt32(7, calendarEvent->GetFlags()); - stmt->setUInt32(8, uint32(calendarEvent->GetLockDate())); + stmt->setInt64(8, calendarEvent->GetLockDate()); CharacterDatabase.Execute(stmt); } @@ -266,7 +266,7 @@ void CalendarMgr::UpdateInvite(CalendarInvite* invite, CharacterDatabaseTransact stmt->setUInt64(2, invite->GetInviteeGUID().GetCounter()); stmt->setUInt64(3, invite->GetSenderGUID().GetCounter()); stmt->setUInt8(4, invite->GetStatus()); - stmt->setUInt32(5, uint32(invite->GetResponseTime())); + stmt->setInt64(5, invite->GetResponseTime()); stmt->setUInt8(6, invite->GetRank()); stmt->setString(7, invite->GetNote()); CharacterDatabase.ExecuteOrAppend(trans, stmt); diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index c620a739d45..11fe3deb710 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -174,7 +174,7 @@ void Channel::CleanOldChannelsInDB() if (sWorld->getIntConfig(CONFIG_PRESERVE_CUSTOM_CHANNEL_DURATION) > 0) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_OLD_CHANNELS); - stmt->setUInt32(0, sWorld->getIntConfig(CONFIG_PRESERVE_CUSTOM_CHANNEL_DURATION) * DAY); + stmt->setInt64(0, sWorld->getIntConfig(CONFIG_PRESERVE_CUSTOM_CHANNEL_DURATION) * DAY); CharacterDatabase.Execute(stmt); TC_LOG_DEBUG("chat.system", "Cleaned out unused custom chat channels."); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index e0e75e06f4a..463c1b714d6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -18045,10 +18045,10 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) uint32 totaltime; uint32 leveltime; float rest_bonus; - uint32 logout_time; + time_t logout_time; uint8 is_logout_resting; uint32 resettalents_cost; - uint32 resettalents_time; + time_t resettalents_time; uint32 primarySpecialization; float trans_x; float trans_y; @@ -18060,7 +18060,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) uint16 at_login; uint16 zone; uint8 online; - uint32 death_expire_time; + time_t death_expire_time; std::string taxi_path; Difficulty dungeonDifficulty; uint32 totalKills; @@ -18113,10 +18113,10 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) totaltime = fields[i++].GetUInt32(); leveltime = fields[i++].GetUInt32(); rest_bonus = fields[i++].GetFloat(); - logout_time = fields[i++].GetUInt32(); + logout_time = fields[i++].GetInt64(); is_logout_resting = fields[i++].GetUInt8(); resettalents_cost = fields[i++].GetUInt32(); - resettalents_time = fields[i++].GetUInt32(); + resettalents_time = fields[i++].GetInt64(); primarySpecialization = fields[i++].GetUInt32(); trans_x = fields[i++].GetFloat(); trans_y = fields[i++].GetFloat(); @@ -18128,7 +18128,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) at_login = fields[i++].GetUInt16(); zone = fields[i++].GetUInt16(); online = fields[i++].GetUInt8(); - death_expire_time = fields[i++].GetUInt32(); + death_expire_time = fields[i++].GetInt64(); taxi_path = fields[i++].GetString(); dungeonDifficulty = Difficulty(fields[i++].GetUInt8()); totalKills = fields[i++].GetUInt32(); @@ -18586,7 +18586,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) SaveRecallPosition(); time_t now = time(nullptr); - time_t logoutTime = time_t(fields.logout_time); + time_t logoutTime = fields.logout_time; // since last logout (in seconds) uint32 time_diff = uint32(now - logoutTime); //uint64 is excessive for a time_diff in seconds.. uint32 allows for 136~ year difference. @@ -18604,7 +18604,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) m_Played_time[PLAYED_TIME_LEVEL] = fields.leveltime; SetTalentResetCost(fields.resettalents_cost); - SetTalentResetTime(time_t(fields.resettalents_time)); + SetTalentResetTime(fields.resettalents_time); m_taxi.LoadTaxiMask(fields.taximask); // must be before InitTaxiNodesForLevel @@ -18631,7 +18631,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) m_lastHonorUpdateTime = logoutTime; UpdateHonorFields(); - m_deathExpireTime = time_t(fields.death_expire_time); + m_deathExpireTime = fields.death_expire_time; if (m_deathExpireTime > now + MAX_DEATH_COUNT * DEATH_EXPIRE_STEP) m_deathExpireTime = now + MAX_DEATH_COUNT * DEATH_EXPIRE_STEP - 1; @@ -19618,8 +19618,8 @@ void Player::_LoadMail() m->receiver = fields[3].GetUInt64(); m->subject = fields[4].GetString(); m->body = fields[5].GetString(); - m->expire_time = time_t(fields[6].GetUInt32()); - m->deliver_time = time_t(fields[7].GetUInt32()); + m->expire_time = fields[6].GetInt64(); + m->deliver_time = fields[7].GetInt64(); m->money = fields[8].GetUInt64(); m->COD = fields[9].GetUInt64(); m->checked = fields[10].GetUInt8(); @@ -19725,7 +19725,7 @@ void Player::_LoadQuestStatus(PreparedQueryResult result) GetName().c_str(), GetGUID().ToString().c_str(), quest_id, qstatus); } - time_t quest_time = time_t(fields[2].GetUInt32()); + time_t quest_time = fields[2].GetInt64(); if (quest->HasSpecialFlag(QUEST_SPECIAL_FLAGS_TIMED) && !GetQuestRewardStatus(quest_id)) { @@ -19877,13 +19877,13 @@ void Player::_LoadDailyQuestStatus(PreparedQueryResult result) if (qQuest->IsDFQuest()) { m_DFQuests.insert(qQuest->GetQuestId()); - m_lastDailyQuestTime = time_t(fields[1].GetUInt32()); + m_lastDailyQuestTime = fields[1].GetInt64(); continue; } } // save _any_ from daily quest times (it must be after last reset anyway) - m_lastDailyQuestTime = time_t(fields[1].GetUInt32()); + m_lastDailyQuestTime = fields[1].GetInt64(); Quest const* quest = sObjectMgr->GetQuestTemplate(quest_id); if (!quest) @@ -20077,7 +20077,7 @@ void Player::_LoadBoundInstances(PreparedQueryResult result) uint8 difficulty = fields[3].GetUInt8(); BindExtensionState extendState = BindExtensionState(fields[4].GetUInt8()); - time_t resetTime = time_t(fields[5].GetUInt64()); + time_t resetTime = fields[5].GetInt64(); // the resettime for normal instances is only saved when the InstanceSave is unloaded // so the value read from the DB may be wrong here but only if the InstanceSave is loaded // and in that case it is not used @@ -20665,18 +20665,18 @@ void Player::SaveToDB(LoginDatabaseTransaction loginTransaction, CharacterDataba stmt->setUInt32(index++, m_Played_time[PLAYED_TIME_TOTAL]); stmt->setUInt32(index++, m_Played_time[PLAYED_TIME_LEVEL]); stmt->setFloat(index++, finiteAlways(_restMgr->GetRestBonus(REST_TYPE_XP))); - stmt->setUInt32(index++, uint32(time(nullptr))); + stmt->setUInt64(index++, time(nullptr)); stmt->setUInt8(index++, (HasPlayerFlag(PLAYER_FLAGS_RESTING) ? 1 : 0)); //save, far from tavern/city //save, but in tavern/city stmt->setUInt32(index++, GetTalentResetCost()); - stmt->setUInt32(index++, GetTalentResetTime()); + stmt->setInt64(index++, GetTalentResetTime()); stmt->setUInt32(index++, GetPrimarySpecialization()); stmt->setUInt16(index++, (uint16)m_ExtraFlags); stmt->setUInt8(index++, m_stableSlots); stmt->setUInt16(index++, (uint16)m_atLoginFlags); stmt->setUInt16(index++, GetZoneId()); - stmt->setUInt32(index++, uint32(m_deathExpireTime)); + stmt->setInt64(index++, m_deathExpireTime); ss.str(""); ss << m_taxi.SaveTaxiDestinationsToString(); @@ -20807,19 +20807,19 @@ void Player::SaveToDB(LoginDatabaseTransaction loginTransaction, CharacterDataba stmt->setUInt32(index++, m_Played_time[PLAYED_TIME_TOTAL]); stmt->setUInt32(index++, m_Played_time[PLAYED_TIME_LEVEL]); stmt->setFloat(index++, finiteAlways(_restMgr->GetRestBonus(REST_TYPE_XP))); - stmt->setUInt32(index++, uint32(time(nullptr))); + stmt->setUInt64(index++, time(nullptr)); stmt->setUInt8(index++, (HasPlayerFlag(PLAYER_FLAGS_RESTING) ? 1 : 0)); //save, far from tavern/city //save, but in tavern/city stmt->setUInt32(index++, GetTalentResetCost()); - stmt->setUInt32(index++, GetTalentResetTime()); + stmt->setInt64(index++, GetTalentResetTime()); stmt->setUInt8(index++, GetNumRespecs()); stmt->setUInt32(index++, GetPrimarySpecialization()); stmt->setUInt16(index++, (uint16)m_ExtraFlags); stmt->setUInt8(index++, m_stableSlots); stmt->setUInt16(index++, (uint16)m_atLoginFlags); stmt->setUInt16(index++, GetZoneId()); - stmt->setUInt32(index++, uint32(m_deathExpireTime)); + stmt->setInt64(index++, m_deathExpireTime); ss.str(""); ss << m_taxi.SaveTaxiDestinationsToString(); @@ -21350,8 +21350,8 @@ void Player::_SaveMail(CharacterDatabaseTransaction& trans) { stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_MAIL); stmt->setUInt8(0, uint8(m->HasItems() ? 1 : 0)); - stmt->setUInt32(1, uint32(m->expire_time)); - stmt->setUInt32(2, uint32(m->deliver_time)); + stmt->setInt64(1, m->expire_time); + stmt->setInt64(2, m->deliver_time); stmt->setUInt64(3, m->money); stmt->setUInt64(4, m->COD); stmt->setUInt8(5, uint8(m->checked)); @@ -21435,7 +21435,7 @@ void Player::_SaveQuestStatus(CharacterDatabaseTransaction& trans) stmt->setUInt64(0, GetGUID().GetCounter()); stmt->setUInt32(1, statusItr->first); stmt->setUInt8(2, uint8(qData.Status)); - stmt->setUInt32(3, uint32(qData.Timer / IN_MILLISECONDS+ GameTime::GetGameTime())); + stmt->setInt64(3, qData.Timer / IN_MILLISECONDS + GameTime::GetGameTime()); trans->Append(stmt); // Save objectives @@ -21511,7 +21511,7 @@ void Player::_SaveDailyQuestStatus(CharacterDatabaseTransaction& trans) stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHARACTER_QUESTSTATUS_DAILY); stmt->setUInt64(0, GetGUID().GetCounter()); stmt->setUInt32(1, questId); - stmt->setUInt64(2, uint64(m_lastDailyQuestTime)); + stmt->setInt64(2, m_lastDailyQuestTime); trans->Append(stmt); } @@ -21522,7 +21522,7 @@ void Player::_SaveDailyQuestStatus(CharacterDatabaseTransaction& trans) stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHARACTER_QUESTSTATUS_DAILY); stmt->setUInt64(0, GetGUID().GetCounter()); stmt->setUInt32(1, (*itr)); - stmt->setUInt64(2, uint64(m_lastDailyQuestTime)); + stmt->setInt64(2, m_lastDailyQuestTime); trans->Append(stmt); } } @@ -28232,7 +28232,7 @@ void Player::_SaveInstanceTimeRestrictions(CharacterDatabaseTransaction& trans) stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_ACCOUNT_INSTANCE_LOCK_TIMES); stmt->setUInt32(0, GetSession()->GetAccountId()); stmt->setUInt32(1, itr->first); - stmt->setUInt64(2, itr->second); + stmt->setInt64(2, itr->second); trans->Append(stmt); } } diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index f192af9f148..8158e1dafbc 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1635,7 +1635,7 @@ void GameEventMgr::SaveWorldEventStateToDB(uint16 event_id) stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GAME_EVENT_SAVE); stmt->setUInt8(0, uint8(event_id)); stmt->setUInt8(1, mGameEvent[event_id].state); - stmt->setUInt32(2, mGameEvent[event_id].nextstart ? uint32(mGameEvent[event_id].nextstart) : 0); + stmt->setInt64(2, mGameEvent[event_id].nextstart ? mGameEvent[event_id].nextstart : SI64LIT(0)); trans->Append(stmt); CharacterDatabase.CommitTransaction(trans); } diff --git a/src/server/game/Garrison/Garrison.cpp b/src/server/game/Garrison/Garrison.cpp index 9c84f6a712b..913c9516f2f 100644 --- a/src/server/game/Garrison/Garrison.cpp +++ b/src/server/game/Garrison/Garrison.cpp @@ -65,7 +65,7 @@ bool Garrison::LoadFromDB(PreparedQueryResult garrison, PreparedQueryResult blue fields = buildings->Fetch(); uint32 plotInstanceId = fields[0].GetUInt32(); uint32 buildingId = fields[1].GetUInt32(); - time_t timeBuilt = time_t(fields[2].GetUInt64()); + time_t timeBuilt = fields[2].GetInt64(); bool active = fields[3].GetBool(); @@ -168,7 +168,7 @@ void Garrison::SaveToDB(CharacterDatabaseTransaction trans) stmt->setUInt64(0, _owner->GetGUID().GetCounter()); stmt->setUInt32(1, plot.BuildingInfo.PacketInfo->GarrPlotInstanceID); stmt->setUInt32(2, plot.BuildingInfo.PacketInfo->GarrBuildingID); - stmt->setUInt64(3, plot.BuildingInfo.PacketInfo->TimeBuilt); + stmt->setInt64(3, plot.BuildingInfo.PacketInfo->TimeBuilt); stmt->setBool(4, plot.BuildingInfo.PacketInfo->Active); trans->Append(stmt); } diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index cfecba63541..c56bc2dbebc 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6045,18 +6045,17 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) time_t curTime = time(nullptr); tm lt; localtime_r(&curTime, <); - uint64 basetime(curTime); TC_LOG_INFO("misc", "Returning mails current time: hour: %d, minute: %d, second: %d ", lt.tm_hour, lt.tm_min, lt.tm_sec); // Delete all old mails without item and without body immediately, if starting server if (!serverUp) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_EMPTY_EXPIRED_MAIL); - stmt->setUInt64(0, basetime); + stmt->setInt64(0, curTime); CharacterDatabase.Execute(stmt); } CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_EXPIRED_MAIL); - stmt->setUInt64(0, basetime); + stmt->setInt64(0, curTime); PreparedQueryResult result = CharacterDatabase.Query(stmt); if (!result) { @@ -6066,7 +6065,7 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) std::map<uint32 /*messageId*/, MailItemInfoVec> itemsCache; stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_EXPIRED_MAIL_ITEMS); - stmt->setUInt32(0, (uint32)basetime); + stmt->setUInt32(0, curTime); if (PreparedQueryResult items = CharacterDatabase.Query(stmt)) { MailItemInfo item; @@ -6091,7 +6090,7 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) m->sender = fields[2].GetUInt64(); m->receiver = fields[3].GetUInt64(); bool has_items = fields[4].GetBool(); - m->expire_time = time_t(fields[5].GetUInt32()); + m->expire_time = fields[5].GetInt64(); m->deliver_time = 0; m->COD = fields[6].GetUInt64(); m->checked = fields[7].GetUInt8(); @@ -6136,8 +6135,8 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_MAIL_RETURNED); stmt->setUInt64(0, m->receiver); stmt->setUInt64(1, m->sender); - stmt->setUInt32(2, basetime + 30 * DAY); - stmt->setUInt32(3, basetime); + stmt->setInt64 (2, curTime + 30 * DAY); + stmt->setInt64 (3, curTime); stmt->setUInt8 (4, uint8(MAIL_CHECK_MASK_RETURNED)); stmt->setUInt32(5, m->messageID); CharacterDatabase.Execute(stmt); diff --git a/src/server/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp index 795251e02ff..b884890c0ba 100644 --- a/src/server/game/Groups/GroupMgr.cpp +++ b/src/server/game/Groups/GroupMgr.cpp @@ -235,7 +235,7 @@ void GroupMgr::LoadGroups() if (!difficultyEntry || difficultyEntry->InstanceType != mapEntry->InstanceType) continue; - InstanceSave* save = sInstanceSaveMgr->AddInstanceSave(mapEntry->ID, fields[2].GetUInt32(), Difficulty(diff), time_t(fields[5].GetUInt32()), fields[6].GetUInt32(), fields[7].GetUInt64() == 0, true); + InstanceSave* save = sInstanceSaveMgr->AddInstanceSave(mapEntry->ID, fields[2].GetUInt32(), Difficulty(diff), fields[5].GetInt64(), fields[6].GetUInt32(), fields[7].GetUInt64() == 0, true); group->BindToInstance(save, fields[3].GetBool(), true); ++count; } diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 487ac491966..79326a97a38 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -134,7 +134,7 @@ void Guild::EventLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) const stmt->setUInt64(++index, m_playerGuid1); stmt->setUInt64(++index, m_playerGuid2); stmt->setUInt8 (++index, m_newRank); - stmt->setUInt64(++index, m_timestamp); + stmt->setInt64 (++index, m_timestamp); trans->Append(stmt); } @@ -173,7 +173,7 @@ void Guild::BankEventLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) con stmt->setUInt64(++index, m_itemOrMoney); stmt->setUInt16(++index, m_itemStackCount); stmt->setUInt8 (++index, m_destTabId); - stmt->setUInt64(++index, m_timestamp); + stmt->setInt64 (++index, m_timestamp); trans->Append(stmt); } @@ -218,7 +218,7 @@ void Guild::NewsLogEntry::SaveToDB(CharacterDatabaseTransaction& trans) const stmt->setUInt64(++index, GetPlayerGuid().GetCounter()); stmt->setUInt32(++index, GetFlags()); stmt->setUInt32(++index, GetValue()); - stmt->setUInt64(++index, GetTimestamp()); + stmt->setInt64 (++index, GetTimestamp()); CharacterDatabase.ExecuteOrAppend(trans, stmt); } @@ -2421,7 +2421,7 @@ bool Guild::LoadEventLogFromDB(Field* fields) const m_eventLog->LoadEvent(new EventLogEntry( m_id, // guild id fields[1].GetUInt32(), // guid - time_t(fields[6].GetUInt32()), // timestamp + fields[6].GetInt64(), // timestamp GuildEventLogTypes(fields[2].GetUInt8()), // event type fields[3].GetUInt64(), // player guid 1 fields[4].GetUInt64(), // player guid 2 @@ -2459,7 +2459,7 @@ bool Guild::LoadBankEventLogFromDB(Field* fields) pLog->LoadEvent(new BankEventLogEntry( m_id, // guild id guid, // guid - time_t(fields[8].GetUInt32()), // timestamp + fields[8].GetInt64(), // timestamp dbTabId, // tab id eventType, // event type fields[4].GetUInt64(), // player guid @@ -2479,7 +2479,7 @@ void Guild::LoadGuildNewsLogFromDB(Field* fields) const m_newsLog->LoadEvent(new NewsLogEntry( m_id, // guild id fields[1].GetUInt32(), // guid - fields[6].GetUInt32(), // timestamp //64 bits? + fields[6].GetInt64(), // timestamp //64 bits? GuildNews(fields[2].GetUInt8()), // type ObjectGuid::Create<HighGuid::Player>(fields[3].GetUInt64()), // player guid fields[4].GetUInt32(), // Flags diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 20e6196d66e..17cb2a3d7f6 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -406,14 +406,14 @@ class TC_GAME_API Guild virtual ~LogEntry() { } uint32 GetGUID() const { return m_guid; } - uint64 GetTimestamp() const { return m_timestamp; } + time_t GetTimestamp() const { return m_timestamp; } virtual void SaveToDB(CharacterDatabaseTransaction& trans) const = 0; protected: ObjectGuid::LowType m_guildId; uint32 m_guid; - uint64 m_timestamp; + time_t m_timestamp; }; // Event log entry diff --git a/src/server/game/Guilds/GuildFinderMgr.cpp b/src/server/game/Guilds/GuildFinderMgr.cpp index 3517bf3b399..a6ff56d015e 100644 --- a/src/server/game/Guilds/GuildFinderMgr.cpp +++ b/src/server/game/Guilds/GuildFinderMgr.cpp @@ -114,9 +114,9 @@ void GuildFinderMgr::LoadMembershipRequests() uint8 classRoles = fields[3].GetUInt8(); uint8 interests = fields[4].GetUInt8(); std::string comment = fields[5].GetString(); - uint32 submitTime = fields[6].GetUInt32(); + time_t submitTime = fields[6].GetInt64(); - MembershipRequest request(playerId, guildId, availability, classRoles, interests, std::move(comment), time_t(submitTime)); + MembershipRequest request(playerId, guildId, availability, classRoles, interests, std::move(comment), submitTime); _membershipRequestsByGuild[guildId][playerId] = request; _membershipRequestsByPlayer[playerId][guildId] = request; @@ -140,7 +140,7 @@ void GuildFinderMgr::AddMembershipRequest(ObjectGuid const& guildGuid, Membershi stmt->setUInt8(3, request.GetClassRoles()); stmt->setUInt8(4, request.GetInterests()); stmt->setString(5, request.GetComment()); - stmt->setUInt32(6, request.GetSubmitTime()); + stmt->setInt64(6, request.GetSubmitTime()); trans->Append(stmt); CharacterDatabase.CommitTransaction(trans); diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index f7fa4c3ce2a..c28c1639c50 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -168,7 +168,7 @@ void InstanceSaveManager::RemoveInstanceSave(uint32 InstanceId) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_INSTANCE_RESETTIME); - stmt->setUInt64(0, uint64(resettime)); + stmt->setInt64(0, resettime); stmt->setUInt32(1, InstanceId); CharacterDatabase.Execute(stmt); @@ -422,7 +422,7 @@ void InstanceSaveManager::LoadResetTimes() CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GLOBAL_INSTANCE_RESETTIME); stmt->setUInt16(0, uint16(mapid)); stmt->setUInt8(1, uint8(difficulty)); - stmt->setUInt64(2, uint64(t)); + stmt->setInt64(2, t); CharacterDatabase.DirectExecute(stmt); } @@ -434,7 +434,7 @@ void InstanceSaveManager::LoadResetTimes() t += ((today - t) / period + 1) * period + diff; CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GLOBAL_INSTANCE_RESETTIME); - stmt->setUInt64(0, uint64(t)); + stmt->setInt64(0, t); stmt->setUInt16(1, uint16(mapid)); stmt->setUInt8(2, uint8(difficulty)); CharacterDatabase.DirectExecute(stmt); diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 52efa753baf..f66ea00ded5 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -225,8 +225,8 @@ void MailDraft::SendMailTo(CharacterDatabaseTransaction& trans, MailReceiver con stmt->setString(++index, GetSubject()); stmt->setString(++index, GetBody()); stmt->setBool (++index, !m_items.empty()); - stmt->setUInt64(++index, uint64(expire_time)); - stmt->setUInt64(++index, uint64(deliver_time)); + stmt->setInt64 (++index, expire_time); + stmt->setInt64 (++index, deliver_time); stmt->setUInt64(++index, m_money); stmt->setUInt64(++index, m_COD); stmt->setUInt8 (++index, uint8(checked)); diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 25c57136eef..7545aa100ad 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -4504,7 +4504,7 @@ void Map::SaveRespawnTimeDB(SpawnObjectType type, ObjectGuid::LowType spawnId, t // Just here for support of compatibility mode CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement((type == SPAWN_TYPE_GAMEOBJECT) ? CHAR_REP_GO_RESPAWN : CHAR_REP_CREATURE_RESPAWN); stmt->setUInt64(0, spawnId); - stmt->setUInt64(1, uint64(respawnTime)); + stmt->setInt64(1, respawnTime); stmt->setUInt16(2, GetId()); stmt->setUInt32(3, GetInstanceId()); CharacterDatabase.ExecuteOrAppend(dbTrans, stmt); @@ -4521,10 +4521,10 @@ void Map::LoadRespawnTimes() { Field* fields = result->Fetch(); ObjectGuid::LowType loguid = fields[0].GetUInt64(); - uint64 respawnTime = fields[1].GetUInt64(); + time_t respawnTime = fields[1].GetInt64(); if (CreatureData const* cdata = sObjectMgr->GetCreatureData(loguid)) - SaveRespawnTime(SPAWN_TYPE_CREATURE, loguid, cdata->id, time_t(respawnTime), GetZoneId(PhasingHandler::GetEmptyPhaseShift(), cdata->spawnPoint), Trinity::ComputeGridCoord(cdata->spawnPoint.GetPositionX(), cdata->spawnPoint.GetPositionY()).GetId(), false); + SaveRespawnTime(SPAWN_TYPE_CREATURE, loguid, cdata->id, respawnTime, GetZoneId(PhasingHandler::GetEmptyPhaseShift(), cdata->spawnPoint), Trinity::ComputeGridCoord(cdata->spawnPoint.GetPositionX(), cdata->spawnPoint.GetPositionY()).GetId(), false); } while (result->NextRow()); } @@ -4538,10 +4538,10 @@ void Map::LoadRespawnTimes() { Field* fields = result->Fetch(); ObjectGuid::LowType loguid = fields[0].GetUInt64(); - uint64 respawnTime = fields[1].GetUInt64(); + time_t respawnTime = fields[1].GetInt64(); if (GameObjectData const* godata = sObjectMgr->GetGameObjectData(loguid)) - SaveRespawnTime(SPAWN_TYPE_GAMEOBJECT, loguid, godata->id, time_t(respawnTime), GetZoneId(PhasingHandler::GetEmptyPhaseShift(), godata->spawnPoint), Trinity::ComputeGridCoord(godata->spawnPoint.GetPositionX(), godata->spawnPoint.GetPositionY()).GetId(), false); + SaveRespawnTime(SPAWN_TYPE_GAMEOBJECT, loguid, godata->id, respawnTime, GetZoneId(PhasingHandler::GetEmptyPhaseShift(), godata->spawnPoint), Trinity::ComputeGridCoord(godata->spawnPoint.GetPositionX(), godata->spawnPoint.GetPositionY()).GetId(), false); } while (result->NextRow()); } diff --git a/src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp b/src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp index 9aa439e99b3..f0bca839098 100644 --- a/src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp +++ b/src/server/game/Quests/QuestObjectiveCriteriaMgr.cpp @@ -93,7 +93,7 @@ void QuestObjectiveCriteriaMgr::LoadFromDB(PreparedQueryResult objectiveResult, Field* fields = criteriaResult->Fetch(); uint32 criteriaId = fields[0].GetUInt32(); uint64 counter = fields[1].GetUInt64(); - time_t date = time_t(fields[2].GetUInt32()); + time_t date = fields[2].GetInt64(); Criteria const* criteria = sCriteriaMgr->GetCriteria(criteriaId); if (!criteria) @@ -154,7 +154,7 @@ void QuestObjectiveCriteriaMgr::SaveToDB(CharacterDatabaseTransaction& trans) stmt->setUInt64(0, _owner->GetGUID().GetCounter()); stmt->setUInt32(1, criteriaProgres.first); stmt->setUInt64(2, criteriaProgres.second.Counter); - stmt->setUInt32(3, uint32(criteriaProgres.second.Date)); + stmt->setInt64(3, criteriaProgres.second.Date); trans->Append(stmt); } diff --git a/src/server/game/Scenarios/InstanceScenario.cpp b/src/server/game/Scenarios/InstanceScenario.cpp index 4577167b814..5eeb5ca709d 100644 --- a/src/server/game/Scenarios/InstanceScenario.cpp +++ b/src/server/game/Scenarios/InstanceScenario.cpp @@ -78,7 +78,7 @@ void InstanceScenario::SaveToDB() stmt->setUInt32(0, id); stmt->setUInt32(1, iter->first); stmt->setUInt64(2, iter->second.Counter); - stmt->setUInt32(3, uint32(iter->second.Date)); + stmt->setInt64(3, iter->second.Date); trans->Append(stmt); } @@ -105,7 +105,7 @@ void InstanceScenario::LoadInstanceData(uint32 instanceId) Field* fields = result->Fetch(); uint32 id = fields[0].GetUInt32(); uint64 counter = fields[1].GetUInt64(); - time_t date = time_t(fields[2].GetUInt32()); + time_t date = fields[2].GetInt64(); Criteria const* criteria = sCriteriaMgr->GetCriteria(id); if (!criteria) diff --git a/src/server/game/Server/Packets/CharacterPackets.cpp b/src/server/game/Server/Packets/CharacterPackets.cpp index e2c96cade37..59f18425ff0 100644 --- a/src/server/game/Server/Packets/CharacterPackets.cpp +++ b/src/server/game/Server/Packets/CharacterPackets.cpp @@ -134,7 +134,7 @@ EnumCharactersResult::CharacterInfo::CharacterInfo(Field* fields) Tokenizer equipment(fields[17].GetString(), ' '); ListPosition = fields[19].GetUInt8(); - LastPlayedTime = fields[20].GetUInt32(); + LastPlayedTime = fields[20].GetInt64(); if (ChrSpecializationEntry const* spec = sDB2Manager.GetChrSpecializationByIndex(ClassID, fields[21].GetUInt8())) SpecID = spec->ID; diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 2a4771f4015..5c7099d1859 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -775,20 +775,20 @@ void WorldSession::LoadAccountData(PreparedQueryResult result, uint32 mask) continue; } - _accountData[type].Time = time_t(fields[1].GetUInt32()); + _accountData[type].Time = fields[1].GetInt64(); _accountData[type].Data = fields[2].GetString(); } while (result->NextRow()); } -void WorldSession::SetAccountData(AccountDataType type, uint32 time, std::string const& data) +void WorldSession::SetAccountData(AccountDataType type, time_t time, std::string const& data) { if ((1 << type) & GLOBAL_CACHE_MASK) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_ACCOUNT_DATA); stmt->setUInt32(0, GetAccountId()); stmt->setUInt8(1, type); - stmt->setUInt32(2, time); + stmt->setInt64(2, time); stmt->setString(3, data); CharacterDatabase.Execute(stmt); } @@ -801,12 +801,12 @@ void WorldSession::SetAccountData(AccountDataType type, uint32 time, std::string CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_PLAYER_ACCOUNT_DATA); stmt->setUInt64(0, m_GUIDLow); stmt->setUInt8(1, type); - stmt->setUInt32(2, time); + stmt->setInt64(2, time); stmt->setString(3, data); CharacterDatabase.Execute(stmt); } - _accountData[type].Time = time_t(time); + _accountData[type].Time = time; _accountData[type].Data = data; } diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 2269bc1dc8e..df5610e96a7 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -1040,7 +1040,7 @@ class TC_GAME_API WorldSession // Account Data AccountData const* GetAccountData(AccountDataType type) const { return &_accountData[type]; } - void SetAccountData(AccountDataType type, uint32 time, std::string const& data); + void SetAccountData(AccountDataType type, time_t time, std::string const& data); void LoadAccountData(PreparedQueryResult result, uint32 mask); void LoadTutorialsData(PreparedQueryResult result); diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index e5e48812d2a..95eff17a30e 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -49,10 +49,10 @@ struct SpellHistory::PersistenceHelper<Player> return false; cooldownEntry->SpellId = *spellId; - cooldownEntry->CooldownEnd = Clock::from_time_t(time_t(fields[2].GetUInt32())); + cooldownEntry->CooldownEnd = Clock::from_time_t(fields[2].GetInt64()); cooldownEntry->ItemId = fields[1].GetUInt32(); cooldownEntry->CategoryId = fields[3].GetUInt32(); - cooldownEntry->CategoryEnd = Clock::from_time_t(time_t(fields[4].GetUInt32())); + cooldownEntry->CategoryEnd = Clock::from_time_t(fields[4].GetInt64()); return true; } @@ -62,8 +62,8 @@ struct SpellHistory::PersistenceHelper<Player> if (!sSpellCategoryStore.LookupEntry(*categoryId)) return false; - chargeEntry->RechargeStart = Clock::from_time_t(time_t(fields[1].GetUInt32())); - chargeEntry->RechargeEnd = Clock::from_time_t(time_t(fields[2].GetUInt32())); + chargeEntry->RechargeStart = Clock::from_time_t(fields[1].GetInt64()); + chargeEntry->RechargeEnd = Clock::from_time_t(fields[2].GetInt64()); return true; } @@ -71,16 +71,16 @@ struct SpellHistory::PersistenceHelper<Player> { stmt->setUInt32(index++, cooldown.first); stmt->setUInt32(index++, cooldown.second.ItemId); - stmt->setUInt32(index++, uint32(Clock::to_time_t(cooldown.second.CooldownEnd))); + stmt->setInt64(index++, Clock::to_time_t(cooldown.second.CooldownEnd)); stmt->setUInt32(index++, cooldown.second.CategoryId); - stmt->setUInt32(index++, uint32(Clock::to_time_t(cooldown.second.CategoryEnd))); + stmt->setInt64(index++, Clock::to_time_t(cooldown.second.CategoryEnd)); } static void WriteCharge(PreparedStatementBase* stmt, uint8& index, uint32 chargeCategory, ChargeEntry const& charge) { stmt->setUInt32(index++, chargeCategory); - stmt->setUInt32(index++, uint32(Clock::to_time_t(charge.RechargeStart))); - stmt->setUInt32(index++, uint32(Clock::to_time_t(charge.RechargeEnd))); + stmt->setInt64(index++, Clock::to_time_t(charge.RechargeStart)); + stmt->setInt64(index++, Clock::to_time_t(charge.RechargeEnd)); } }; @@ -101,10 +101,10 @@ struct SpellHistory::PersistenceHelper<Pet> return false; cooldownEntry->SpellId = *spellId; - cooldownEntry->CooldownEnd = Clock::from_time_t(time_t(fields[1].GetUInt32())); + cooldownEntry->CooldownEnd = Clock::from_time_t(fields[1].GetInt64()); cooldownEntry->ItemId = 0; cooldownEntry->CategoryId = fields[2].GetUInt32(); - cooldownEntry->CategoryEnd = Clock::from_time_t(time_t(fields[3].GetUInt32())); + cooldownEntry->CategoryEnd = Clock::from_time_t(fields[3].GetInt64()); return true; } @@ -114,24 +114,24 @@ struct SpellHistory::PersistenceHelper<Pet> if (!sSpellCategoryStore.LookupEntry(*categoryId)) return false; - chargeEntry->RechargeStart = Clock::from_time_t(time_t(fields[1].GetUInt32())); - chargeEntry->RechargeEnd = Clock::from_time_t(time_t(fields[2].GetUInt32())); + chargeEntry->RechargeStart = Clock::from_time_t(fields[1].GetInt64()); + chargeEntry->RechargeEnd = Clock::from_time_t(fields[2].GetInt64()); return true; } static void WriteCooldown(PreparedStatementBase* stmt, uint8& index, CooldownStorageType::value_type const& cooldown) { stmt->setUInt32(index++, cooldown.first); - stmt->setUInt32(index++, uint32(Clock::to_time_t(cooldown.second.CooldownEnd))); + stmt->setInt64(index++, Clock::to_time_t(cooldown.second.CooldownEnd)); stmt->setUInt32(index++, cooldown.second.CategoryId); - stmt->setUInt32(index++, uint32(Clock::to_time_t(cooldown.second.CategoryEnd))); + stmt->setInt64(index++, Clock::to_time_t(cooldown.second.CategoryEnd)); } static void WriteCharge(PreparedStatementBase* stmt, uint8& index, uint32 chargeCategory, ChargeEntry const& charge) { stmt->setUInt32(index++, chargeCategory); - stmt->setUInt32(index++, uint32(Clock::to_time_t(charge.RechargeStart))); - stmt->setUInt32(index++, uint32(Clock::to_time_t(charge.RechargeEnd))); + stmt->setInt64(index++, Clock::to_time_t(charge.RechargeStart)); + stmt->setInt64(index++, Clock::to_time_t(charge.RechargeEnd)); } }; diff --git a/src/server/game/Support/SupportMgr.cpp b/src/server/game/Support/SupportMgr.cpp index 603983b8063..ffb69854952 100644 --- a/src/server/game/Support/SupportMgr.cpp +++ b/src/server/game/Support/SupportMgr.cpp @@ -103,7 +103,7 @@ void BugTicket::LoadFromDB(Field* fields) _id = fields[ idx].GetUInt32(); _playerGuid = ObjectGuid::Create<HighGuid::Player>(fields[++idx].GetUInt64()); _note = fields[++idx].GetString(); - _createTime = fields[++idx].GetUInt32(); + _createTime = fields[++idx].GetInt64(); _mapId = fields[++idx].GetUInt16(); _pos.m_positionX = fields[++idx].GetFloat(); _pos.m_positionY = fields[++idx].GetFloat(); @@ -134,6 +134,7 @@ void BugTicket::SaveToDB() const stmt->setUInt32(idx, _id); stmt->setUInt64(++idx, _playerGuid.GetCounter()); stmt->setString(++idx, _note); + stmt->setInt64(++idx, _createTime); stmt->setUInt16(++idx, _mapId); stmt->setFloat(++idx, _pos.GetPositionX()); stmt->setFloat(++idx, _pos.GetPositionY()); @@ -189,7 +190,7 @@ void ComplaintTicket::LoadFromDB(Field* fields) _id = fields[ idx].GetUInt32(); _playerGuid = ObjectGuid::Create<HighGuid::Player>(fields[++idx].GetUInt64()); _note = fields[++idx].GetString(); - _createTime = fields[++idx].GetUInt32(); + _createTime = fields[++idx].GetInt64(); _mapId = fields[++idx].GetUInt16(); _pos.m_positionX = fields[++idx].GetFloat(); _pos.m_positionY = fields[++idx].GetFloat(); @@ -220,7 +221,7 @@ void ComplaintTicket::LoadFromDB(Field* fields) void ComplaintTicket::LoadChatLineFromDB(Field* fields) { - _chatLog.Lines.emplace_back(fields[0].GetUInt32(), fields[1].GetString()); + _chatLog.Lines.emplace_back(fields[0].GetInt64(), fields[1].GetString()); } void ComplaintTicket::SaveToDB() const @@ -232,6 +233,7 @@ void ComplaintTicket::SaveToDB() const stmt->setUInt32(idx, _id); stmt->setUInt64(++idx, _playerGuid.GetCounter()); stmt->setString(++idx, _note); + stmt->setInt64(++idx, _createTime); stmt->setUInt16(++idx, _mapId); stmt->setFloat(++idx, _pos.GetPositionX()); stmt->setFloat(++idx, _pos.GetPositionY()); @@ -255,7 +257,7 @@ void ComplaintTicket::SaveToDB() const stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_GM_COMPLAINT_CHATLINE); stmt->setUInt32(idx, _id); stmt->setUInt32(++idx, lineIndex); - stmt->setUInt32(++idx, c.Timestamp); + stmt->setInt64(++idx, c.Timestamp); stmt->setString(++idx, c.Text); trans->Append(stmt); @@ -312,7 +314,7 @@ void SuggestionTicket::LoadFromDB(Field* fields) _id = fields[ idx].GetUInt32(); _playerGuid = ObjectGuid::Create<HighGuid::Player>(fields[++idx].GetUInt64()); _note = fields[++idx].GetString(); - _createTime = fields[++idx].GetUInt32(); + _createTime = fields[++idx].GetInt64(); _mapId = fields[++idx].GetUInt16(); _pos.m_positionX = fields[++idx].GetFloat(); _pos.m_positionY = fields[++idx].GetFloat(); @@ -343,6 +345,7 @@ void SuggestionTicket::SaveToDB() const stmt->setUInt32(idx, _id); stmt->setUInt64(++idx, _playerGuid.GetCounter()); stmt->setString(++idx, _note); + stmt->setInt64(++idx, _createTime); stmt->setUInt16(++idx, _mapId); stmt->setFloat(++idx, _pos.GetPositionX()); stmt->setFloat(++idx, _pos.GetPositionY()); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 823901a3d7e..7182d976c09 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -3043,7 +3043,7 @@ BanReturn World::BanCharacter(std::string const& name, std::string const& durati stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHARACTER_BAN); stmt->setUInt64(0, guid.GetCounter()); - stmt->setUInt32(1, duration_secs); + stmt->setInt64(1, duration_secs); stmt->setString(2, author); stmt->setString(3, reason); trans->Append(stmt); |