diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-05-12 10:38:40 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-05-12 10:38:40 +0200 |
| commit | 8e35ee612e932bf5cfeda5a9f3b57c0b1268a317 (patch) | |
| tree | 07e5105854a493454d910bed29d22e0ea85b2169 /src | |
| parent | 5a57b2e7e6b3802188b5bcb57d7ae0aa16476c02 (diff) | |
Core/Auras: Fixed possible crash in charms
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |