diff options
| author | Spp <spp@jorge.gr> | 2012-10-29 12:28:12 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-29 12:28:12 +0100 |
| commit | d2ba73d97f12da64b76895b7335500d1fc993a37 (patch) | |
| tree | 35d6fda15598df1192b97634c217a34c63896dd0 /src/server/game/Entities | |
| parent | c5c8e38789f40ecf15f82cad789f2e0273557c34 (diff) | |
Core/Misc: Proper fix for previous commit (c5c8e38 - check race change before perfoming faction-change actions)
Core/Misc: tab to spaces and remove trailing whitespaces
Diffstat (limited to 'src/server/game/Entities')
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 6 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 973eba5da25..d409b507561 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1577,7 +1577,7 @@ void Player::Update(uint32 p_time) // check every second if (now > m_Last_tick + 1) UpdateSoulboundTradeItems(); - + // If mute expired, remove it from the DB if (GetSession()->m_muteTime && GetSession()->m_muteTime < now) { @@ -15714,7 +15714,7 @@ void Player::SetQuestStatus(uint32 quest_id, QuestStatus status) } uint32 zone = 0, area = 0; - + SpellAreaForQuestMapBounds saBounds = sSpellMgr->GetSpellAreaForQuestMapBounds(quest_id); if (saBounds.first != saBounds.second) { @@ -15725,7 +15725,7 @@ void Player::SetQuestStatus(uint32 quest_id, QuestStatus status) if (!HasAura(itr->second->spellId)) CastSpell(this, itr->second->spellId, true); } - + saBounds = sSpellMgr->GetSpellAreaForQuestEndMapBounds(quest_id); if (saBounds.first != saBounds.second) { diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 743d622e8c9..f8de93afc6d 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6672,7 +6672,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere victim->CastCustomSpell(beaconTarget, triggered_spell_id, &basepoints0, NULL, NULL, true, 0, triggeredByAura); return true; } - + return false; } // Judgements of the Wise |