Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: code style

Browse Source
This commit is contained in:
sevi
2017-03-19 02:00:52 +01:00
parent b4d9cc766e
commit a608658056
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/server/game/Instances/InstanceScript.cpp
View File

@@ -295,6 +295,7 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
//TC_LOG_ERROR("misc", "Inialize boss %u state as %u.", id, (uint32)state);
return false;
}
else
{
if (bossInfo->state == state)
@@ -308,27 +309,26 @@ bool InstanceScript::SetBossState(uint32 id, EncounterState state)
switch (state)
{
case IN_PROGRESS:
{
uint32 resInterval = GetCombatResurrectionChargeInterval();
if (instance->Is25ManRaid() || (instance->Is25ManRaid() && instance->IsHeroic()))
case IN_PROGRESS:
{
InitializeCombatResurrections(3, resInterval);
uint32 resInterval = GetCombatResurrectionChargeInterval();
if (instance->Is25ManRaid() || (instance->Is25ManRaid() && instance->IsHeroic()))
{
InitializeCombatResurrections(3, resInterval);
}
else
{
InitializeCombatResurrections(1, resInterval);
}
break;
}
else
{
InitializeCombatResurrections(1, resInterval);
}
break;
}
case FAIL:
case DONE:
ResetCombatResurrections();
break;
default:
break;
case FAIL:
case DONE:
ResetCombatResurrections();
break;
default:
break;
}
bossInfo->state = state;