*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
a8d5d6fcf1
16 files changed
+139
-55
No files matched your search
+7
-3
@@ -19612,11 +19612,13 @@ void Player::UpdateAreaDependentAuras( uint32 newArea )
|
||||
|
||||
uint32 Player::GetCorpseReclaimDelay(bool pvp) const
|
||||
{
|
||||
if( pvp && !sWorld.getConfig(CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVP) ||
|
||||
!pvp && !sWorld.getConfig(CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVE) )
|
||||
if(pvp)
|
||||
{
|
||||
return copseReclaimDelay[0];
|
||||
if(!sWorld.getConfig(CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVP))
|
||||
return copseReclaimDelay[0];
|
||||
}
|
||||
else if(!sWorld.getConfig(CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVE) )
|
||||
return 0;
|
||||
|
||||
time_t now = time(NULL);
|
||||
// 0..2 full period
|
||||
@@ -19687,6 +19689,8 @@ void Player::SendCorpseReclaimDelay(bool load)
|
||||
else
|
||||
delay = GetCorpseReclaimDelay(pvp);
|
||||
|
||||
if(!delay) return;
|
||||
|
||||
//! corpse reclaim delay 30 * 1000ms or longer at often deaths
|
||||
WorldPacket data(SMSG_CORPSE_RECLAIM_DELAY, 4);
|
||||
data << uint32(delay*1000);
|
||||
|
||||
Reference in new issue
Block a user