diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-12-10 12:39:37 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-04-15 05:53:27 +0200 |
| commit | e17e4e6f0700c7d950e1b2654c217ec8b28ae79e (patch) | |
| tree | 8d78ebf4f2d95c6a18075840f6d02b62b4c6fcad /src/server/game/Mails/Mail.cpp | |
| parent | 76b2d37259c8beb3cc1b698eb28fd7e068366724 (diff) | |
Core/Misc: Replace time(NULL) with GameTime::GetGameTime()
(cherry picked from commit 12701cb0c6c45eb105ad449eb9a56e76d84d691e)
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
src/server/game/Battlefield/Battlefield.cpp
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Calendar/CalendarMgr.h
src/server/game/DungeonFinding/LFGQueue.cpp
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Grids/ObjectGridLoader.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattlefieldHandler.cpp
src/server/game/Handlers/CalendarHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/TicketHandler.cpp
src/server/game/Instances/InstanceSaveMgr.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Tickets/TicketMgr.cpp
src/server/game/Tickets/TicketMgr.h
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_gobject.cpp
src/server/scripts/Commands/cs_instance.cpp
src/server/scripts/Commands/cs_list.cpp
src/server/scripts/Northrend/zone_wintergrasp.cpp
src/server/scripts/Spells/spell_item.cpp
Diffstat (limited to 'src/server/game/Mails/Mail.cpp')
| -rw-r--r-- | src/server/game/Mails/Mail.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index f66ea00ded5..ec4cc305687 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -21,6 +21,7 @@ #include "CalendarMgr.h" #include "CharacterCache.h" #include "DatabaseEnv.h" +#include "GameTime.h" #include "Item.h" #include "Log.h" #include "LootMgr.h" @@ -194,7 +195,7 @@ void MailDraft::SendMailTo(CharacterDatabaseTransaction& trans, MailReceiver con uint32 mailId = sObjectMgr->GenerateMailID(); - time_t deliver_time = time(nullptr) + deliver_delay; + time_t deliver_time = GameTime::GetGameTime() + deliver_delay; //expire time if COD 3 days, if no COD 30 days, if auction sale pending 1 hour uint32 expire_delay; |