diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Player.cpp | 10 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 3eea183617f..e1d12009afb 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -18808,11 +18808,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 @@ -18883,6 +18885,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); diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 827d5c238e7..1ceb1ec37df 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -1098,7 +1098,7 @@ DurabilityLossChance.Parry = 0.05 DurabilityLossChance.Block = 0.05 Death.SicknessLevel = 11 Death.CorpseReclaimDelay.PvP = 1 -Death.CorpseReclaimDelay.PvE = 1 +Death.CorpseReclaimDelay.PvE = 0 ################################################################################################################### # |