Skip to content

Commit

Permalink
Fixed: Attack/Kill command on pets allowing select the pet itself as …
Browse files Browse the repository at this point in the history
…target, making it attack his owner
  • Loading branch information
coruja747 committed Jun 29, 2016
1 parent 039a677 commit 3066341
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion docs/REVISIONS-56-SERIES.TXT
Expand Up @@ -97,4 +97,16 @@ Added: Support for colored multis on target functions (only compatible with HS c
Fixed: Function f_onchar_delete not being called if the player char get deleted in any other way different from client Character Selecion menu.
Fixed: Multi dynamic regions getting replaced by script static regions on server resync.
Fixed: EF_FastWalkPrevention not working correctly.
Fixed: Popup menu on players returning parsing error when send Party clilocs to unsupported clients < 6.0.0.0
Fixed: Popup menu on players returning parsing error when send Party clilocs to unsupported clients < 6.0.0.0

28-06-2016, Coruja
[sphere_item_unsorted.scp]: Fixed wrong TYPE / TDATA2 on i_fountain_life, i_chest_combination.
[sphere_item_deco_carvings_statues.scp]: Fixed wrong TYPE / TDATA2 on i_statue_stone_blessed.
[sphere_item_deco_furniture.scp]: Fixed wrong TDATA2 on i_chest_kings_collection.
[sphere_serv_triggers.scp]: Updated 'f_onchar_delete' comments.
[sphere_defs.scp]: Updated 'mount_items' and 'mem_flags' values.
[sphere_skills.scp]: Reordered properties to follow the same default order on all skills (nothing was changed, just reordered).
[speakhuman.scp]: Fixed 'train' command returning console error when used on guards NPCs.

29-06-2016, Coruja
Fixed: Attack/Kill command on pets allowing select the pet itself as target, making it attack his owner.
2 changes: 1 addition & 1 deletion src/graysvr/CCharNPCPet.cpp
Expand Up @@ -397,7 +397,7 @@ bool CChar::NPC_OnHearPetCmdTarg( int iCmd, CChar *pSrc, CObjBase *pObj, const C
case PC_ATTACK:
case PC_KILL:
{
if ( !pCharTarg || pCharTarg == pSrc )
if ( !pCharTarg || pCharTarg == this || pCharTarg == pSrc )
break;
bSuccess = pCharTarg->OnAttackedBy(pSrc, 1, true); // we know who told them to do this.
if ( bSuccess )
Expand Down

0 comments on commit 3066341

Please sign in to comment.