nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-18 03:15:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2023-03-23 09:07:11 -06:00
committed by GitHub
parent 317afd051b c7fbf89e96
commit 38268a187e
12 changed files with 189 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/Player/Player.cpp
View File

@@ -824,7 +824,7 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
{
if (!IsAlive())
return DISABLED_MIRROR_TIMER;
return 1 * IN_MILLISECONDS;
return 2002;
}
default:
return 0;
@@ -920,7 +920,7 @@ void Player::HandleDrowning(uint32 time_diff)
m_MirrorTimer[FIRE_TIMER] -= time_diff;
if (m_MirrorTimer[FIRE_TIMER] < 0)
{
m_MirrorTimer[FIRE_TIMER] += 1 * IN_MILLISECONDS;
m_MirrorTimer[FIRE_TIMER] += 2002;
// Calculate and deal damage
/// @todo: Check this formula
uint32 damage = urand(600, 700);