From 25acef257240edb7763eac043554ca7c7ac767eb Mon Sep 17 00:00:00 2001 From: Subv Date: Fri, 17 May 2013 21:11:18 -0500 Subject: * Batch of fixes for issues found by static analysis. --- src/server/scripts/World/npcs_special.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/scripts/World') diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index b5f66fcc25e..56841fcdaa1 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1751,7 +1751,7 @@ public: { me->HandleEmoteCommand(emote); Unit* owner = me->GetOwner(); - if (emote != TEXT_EMOTE_KISS || owner || owner->GetTypeId() != TYPEID_PLAYER || + if (emote != TEXT_EMOTE_KISS || !owner || owner->GetTypeId() != TYPEID_PLAYER || owner->ToPlayer()->GetTeam() != player->GetTeam()) { return; -- cgit v1.2.3