aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
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;