From 8e35ee612e932bf5cfeda5a9f3b57c0b1268a317 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 12 May 2011 10:38:40 +0200 Subject: Core/Auras: Fixed possible crash in charms --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 905dbffd141..1cf2ee5274f 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -15745,7 +15745,7 @@ void Unit::RemoveCharmedBy(Unit *charmer) CharmType type; if (HasUnitState(UNIT_STAT_POSSESSED)) type = CHARM_TYPE_POSSESS; - else if (charmer->IsOnVehicle(this)) + else if (charmer && charmer->IsOnVehicle(this)) type = CHARM_TYPE_VEHICLE; else type = CHARM_TYPE_CHARM; -- cgit v1.2.3