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

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source
This commit is contained in:
badcaptain
2013-04-02 19:10:18 -04:00
parent a787a7ce72 989d132423
commit 15e31d1c03
10 changed files with 90 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+4 -2
View File
@@ -1714,8 +1714,10 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
//Check that we can attack before we calc heading and face our target
if (!IsAttackAllowed(other)) {
if (this->GetOwnerID())
entity_list.MessageClose(this, 1, 200, 10, "%s says, 'That is not a legal target master.'", this->GetCleanName());
this->Say_StringID(NOT_LEGAL_TARGET);
if(other) {
if (other->IsClient())
other->CastToClient()->RemoveXTarget(this, false);
RemoveFromHateList(other);
mlog(COMBAT__ATTACKS, "I am not allowed to attack %s", other->GetName());
}
@@ -4339,4 +4341,4 @@ int32 Mob::RuneAbsorb(int32 damage, uint16 type)
}
return damage;
}
}
}