diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2015-03-24 09:54:46 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2015-03-24 09:54:46 +0800 |
| commit | 6055837d5359f1345d4a42e714e2d0b96f588842 (patch) | |
| tree | c72025124789534b9bb583b13cc82a4555cd6876 | |
| parent | 4ccc9d1028127c0fce7dcffafcef3284539f4807 (diff) | |
| parent | 7c9cde841864ff89ee0dda33fbf76c660fbf61a6 (diff) | |
| download | hercules-6055837d5359f1345d4a42e714e2d0b96f588842.tar.gz hercules-6055837d5359f1345d4a42e714e2d0b96f588842.tar.bz2 hercules-6055837d5359f1345d4a42e714e2d0b96f588842.tar.xz hercules-6055837d5359f1345d4a42e714e2d0b96f588842.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
| -rw-r--r-- | db/quest_db.conf | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/db/quest_db.conf b/db/quest_db.conf index 38b6441a7..7c2fcb591 100644 --- a/db/quest_db.conf +++ b/db/quest_db.conf @@ -99,7 +99,7 @@ quest_db: ( Name: "Solo at Sphinx Dungeon!" Targets: ( { - MobId: 2687 + MobId: 1178 Count: 20 }, ) diff --git a/src/map/battle.c b/src/map/battle.c index 9def70dd7..e983eebc6 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6516,6 +6516,8 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f ) { if( t_bl->type == BL_PC && (sd->duel_group == ((TBL_PC*)t_bl)->duel_group) ) return (BCT_ENEMY&flag)?1:-1; // Duel targets can ONLY be your enemy, nothing else. + else if ( src->type != BL_SKILL || (flag&BCT_ENEMY) ) + return 0; } } if( map_flag_gvg(m) && !sd->status.guild_id && t_bl->type == BL_MOB && ((TBL_MOB*)t_bl)->class_ == MOBID_EMPERIUM ) |