diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index cf1031c27d..59a1ce1006 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -1068,7 +1068,8 @@ public: return false; uint32 animId = atoi((char*)args); - handler->GetSession()->GetPlayer()->HandleEmoteCommand(animId); + if (Unit* unit = handler->getSelectedUnit()) + unit->HandleEmoteCommand(animId); return true; }