Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: revert some gametime calls back to getMsTime until the gameevent replacement has been merged

Browse Source
This commit is contained in:
Ovahlord
2019-11-28 22:20:12 +01:00
parent 5aba03330d
commit 8f636eae92
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
View File

@@ -616,7 +616,7 @@ bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction)
void AuctionHouseObject::Update()
{
time_t curTime = GameTime::GetGameTime();
time_t curTime = time(nullptr);
///- Handle expired auctions
// If storage is empty, no need to update. next == nullptr in this case.
@@ -711,7 +711,7 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player
LocaleConstant localeConstant = player->GetSession()->GetSessionDbLocaleIndex();
int locdbc_idx = player->GetSession()->GetSessionDbcLocale();
time_t curTime = GameTime::GetGameTime();
time_t curTime = time(nullptr);
PlayerGetAllThrottleMap::const_iterator itr = GetAllThrottleMap.find(player->GetGUID());
time_t throttleTime = itr != GetAllThrottleMap.end() ? itr->second : curTime;

3
src/server/game/Events/GameEventMgr.cpp
View File

@@ -1771,7 +1771,8 @@ void GameEventMgr::SetHolidayEventTime(GameEventData& event)
bool singleDate = ((holiday->Date[0] >> 24) & 0x1F) == 31; // Events with fixed date within year have - 1
time_t curTime = GameTime::GetGameTime();
// GameTime is not initialized at this point
time_t curTime = time(nullptr);
for (uint8 i = 0; i < MAX_HOLIDAY_DATES && holiday->Date[i]; ++i)
{
uint32 date = holiday->Date[i];