Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge commit '64e34cdec837f9375d6d2ba6b12def8a534e08e7' into 4.3.4

Browse Source 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
This commit is contained in:
Carbenium committed 2015-07-21 18:51:30 +02:00
2 parents 1940583e36 64e34cdec8
commit 8d47083319
4 files changed
+12 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/AI/SmartScripts/SmartScript.cpp
+9 -1
View File
@@ -778,7 +778,15 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
continue;
if (e.action.removeAura.spell)
(*itr)->ToUnit()->RemoveAurasDueToSpell(e.action.removeAura.spell);
{
if (e.action.removeAura.charges)
{
if (Aura* aur = (*itr)->ToUnit()->GetAura(e.action.removeAura.spell))
aur->ModCharges(-e.action.removeAura.charges, AURA_REMOVE_BY_EXPIRE);
}
else
(*itr)->ToUnit()->RemoveAurasDueToSpell(e.action.removeAura.spell);
}
else
(*itr)->ToUnit()->RemoveAllAuras();