diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-11 20:55:54 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-11 20:55:54 +0000 |
| commit | b307bb07a41dd6189bb4133e5095751b5547ad3c (patch) | |
| tree | d290e9f88fb12d88138c2db8fb41e1b5fcd93cad /src/map/battle.c | |
| parent | 9c48b73d948502c2784e43640401a2344de40a7f (diff) | |
| download | hercules-b307bb07a41dd6189bb4133e5095751b5547ad3c.tar.gz hercules-b307bb07a41dd6189bb4133e5095751b5547ad3c.tar.bz2 hercules-b307bb07a41dd6189bb4133e5095751b5547ad3c.tar.xz hercules-b307bb07a41dd6189bb4133e5095751b5547ad3c.zip | |
- Made @monsterignore be an universal ignore. Means you cannot be targetted as an enemy by anything. Also added alias "@battleignore" which does the same as monsterignore.
- Fixed magic power setting your min matk as max-matk.
- Modified the packets involved in @fakename in hopes it'll refresh correctly on nearby clients now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7620 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 0b30f4f1d..5b5889284 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3028,8 +3028,8 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f TBL_PC *sd = (TBL_PC*)t_bl; if (sd->invincible_timer != -1 || pc_isinvisible(sd)) return -1; //Cannot be targeted yet. - if (sd->state.monster_ignore && src->type == BL_MOB) - return 0; //option to have monsters ignore GMs [Valaris] + if (sd->state.monster_ignore && t_bl != s_bl && flag&BCT_ENEMY) + return 0; //Global inmunity to attacks. if (sd->special_state.killable && t_bl != s_bl) { state |= BCT_ENEMY; //Universal Victim |