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

Merge commit '40bb5743acc0d117db3a5b0e0b1919793d25c392' into 4.3.4

Browse Source 
Conflicts:
	sql/updates/world/2014_11_05_00_world.sql
This commit is contained in:
Carbenium committed 2015-07-21 18:53:04 +02:00
2 parents 8d47083319 40bb5743ac
commit fc13ce42df
7 files changed
+107 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/AI/SmartScripts/SmartScript.cpp
+1 -1
View File
@@ -782,7 +782,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
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);
aur->ModCharges(-static_cast<int32>(e.action.removeAura.charges), AURA_REMOVE_BY_EXPIRE);
}
else
(*itr)->ToUnit()->RemoveAurasDueToSpell(e.action.removeAura.spell);