aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTartalo <none@none>2010-06-27 00:58:04 +0200
committerTartalo <none@none>2010-06-27 00:58:04 +0200
commit0fd3e47edcd1cea73a29a101221a3dbe131b4df7 (patch)
tree027fa591d44c70f739d2eefb2452a3d3f2c784d4
parent59ca58a49f33a4a395ff4a345117825936da6527 (diff)
Fix crash when applying mind control to vehicles
Closes issue #2816 What should happen when mind control is applied to vehicles? --HG-- branch : trunk
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index f5d2ad75f93..89fcd379e85 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -3910,6 +3910,9 @@ void AuraEffect::HandleModPossessPet(AuraApplication const * aurApp, uint8 mode,
if (caster->ToPlayer()->GetPet() != target)
return;
+ if (target->IsVehicle()) //Avoid crash when mind controling vehicles due to an assert in Unit::SetCharmedBy
+ return;
+
target->SetCharmedBy(caster, CHARM_TYPE_POSSESS);
}
else