pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-22 12:18:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix /assist to only care about range to assistee

Browse Source
This commit is contained in:
Michael Cook (mackal)
2014-01-22 01:00:48 -05:00
parent cc02d94bdf
commit 3d47d912fd
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
+13 -13
View File
@@ -1554,6 +1554,12 @@ void Client::Handle_OP_TargetCommand(const EQApplicationPacket *app)
SetSenseExemption(false);
return;
}
else if(IsAssistExempted())
{
GetTarget()->IsTargeted(1);
SetAssistExemption(false);
return;
}
else if(GetBindSightTarget())
{
if(GetBindSightTarget()->DistNoRoot(*GetTarget()) > (zone->newzone_data.maxclip*zone->newzone_data.maxclip))
@@ -2747,21 +2753,15 @@ void Client::Handle_OP_Assist(const EQApplicationPacket *app)
EQApplicationPacket* outapp = app->Copy();
eid = (EntityId_Struct*)outapp->pBuffer;
if (RuleB(Combat, AssistNoTargetSelf)) eid->entity_id = GetID();
if(entity && entity->IsMob())
{
if (RuleB(Combat, AssistNoTargetSelf))
eid->entity_id = GetID();
if (entity && entity->IsMob()) {
Mob *assistee = entity->CastToMob();
if(!assistee->IsInvisible(this) && assistee->GetTarget())
{
if (assistee->GetTarget()) {
Mob *new_target = assistee->GetTarget();
if
(
new_target &&
!new_target->IsInvisible(this) &&
(GetGM() || (Dist(*assistee) <= TARGETING_RANGE &&
Dist(*new_target) <= TARGETING_RANGE))
)
{
if (new_target && (GetGM() ||
Dist(*assistee) <= TARGETING_RANGE)) {
SetAssistExemption(true);
eid->entity_id = new_target->GetID();
}
}