Merge branch 'master' into 303

This commit is contained in:
tomrus88 2008-11-30 15:00:46 +03:00
commit afc4d91ed8
3 changed files with 4 additions and 4 deletions

View file

@ -717,9 +717,9 @@ void BattleGround::AddPlayer(Player *plr)
else
plr->CastSpell(plr, SPELL_ALLIANCE_GOLD_FLAG,true);
}
else
else // green
{
if(plr->GetTeam() == HORDE) // green
if(plr->GetTeam() == HORDE)
plr->CastSpell(plr, SPELL_HORDE_GREEN_FLAG,true);
else
plr->CastSpell(plr, SPELL_ALLIANCE_GREEN_FLAG,true);