diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-28 05:43:03 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-28 05:43:03 +0000 |
| commit | b340ca4c2429e7b6320e3b3b81a079bd1ab9ccdc (patch) | |
| tree | 2698a5aed724ce76563dfb1cf27c0a95281ff6ec /src/map | |
| parent | 24ae84fd70124f57a94da489588df39ea09f3d00 (diff) | |
| download | hercules-b340ca4c2429e7b6320e3b3b81a079bd1ab9ccdc.tar.gz hercules-b340ca4c2429e7b6320e3b3b81a079bd1ab9ccdc.tar.bz2 hercules-b340ca4c2429e7b6320e3b3b81a079bd1ab9ccdc.tar.xz hercules-b340ca4c2429e7b6320e3b3b81a079bd1ab9ccdc.zip | |
Fixed bugreport:5515 targets in manhole may now be targeted by shadow form.
Also fixed manhole appearance changing to a trap when activated.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15813 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 28c4f2816..672dc3d74 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4356,7 +4356,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f switch( target->type ) { // Checks on actual target case BL_PC: - if (((TBL_PC*)target)->invincible_timer != INVALID_TIMER || pc_isinvisible((TBL_PC*)target) || ((TBL_PC*)target)->sc.data[SC__MANHOLE]) + if (((TBL_PC*)target)->invincible_timer != INVALID_TIMER || pc_isinvisible((TBL_PC*)target)) return -1; //Cannot be targeted yet. break; case BL_MOB: diff --git a/src/map/skill.c b/src/map/skill.c index e4f75ddcc..317ec007e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -10231,15 +10231,15 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns sg->val2 = bl->id; } else sec = 3000; //Couldn't trap it? - clif_skillunit_update(&src->bl); - - /** - * If you're snared from a trap that was invisible this makes the trap be - * visible again -- being you stepped on it (w/o this the trap remains invisible and you go "WTF WHY I CANT MOVE") - * bugreport:3961 - **/ - clif_changetraplook(&src->bl, UNT_ANKLESNARE); - + if( sg->unit_id == UNT_ANKLESNARE ) { + clif_skillunit_update(&src->bl); + /** + * If you're snared from a trap that was invisible this makes the trap be + * visible again -- being you stepped on it (w/o this the trap remains invisible and you go "WTF WHY I CANT MOVE") + * bugreport:3961 + **/ + clif_changetraplook(&src->bl, UNT_ANKLESNARE); + } sg->limit = DIFF_TICK(tick,sg->tick)+sec; sg->interval = -1; src->range = 0; |