diff options
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 5 | 
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 7c8c9179962..a2b4aba30fd 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -8203,6 +8203,11 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)          ((WorldObject*)this)->SendMessageToSet(&data, true);          ((Creature*)this)->CallAssistance(); + +        // should not let player enter combat by right clicking target +        SetInCombatWith(victim); +        if(victim->GetTypeId() == TYPEID_PLAYER) +            victim->SetInCombatWith(this);      }      // delay offhand weapon attack to next attack time  | 
