From b22f68bbef4fb348c5a22d9c7674bba532d2c116 Mon Sep 17 00:00:00 2001 From: malufett Date: Wed, 8 Jan 2014 22:42:37 +0800 Subject: Fixed Bug#7944 -http://hercules.ws/board/tracker/issue-7944-all-hidecloaking-skills-in-pvpduelwoe/?gopid=21579#entry21579 Signed-off-by: malufett --- src/map/clif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index b442d6279..fc5448472 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -322,7 +322,7 @@ int clif_send_sub(struct block_list *bl, va_list ap) { } /* unless visible, hold it here */ - if( clif->ally_only && !sd->special_state.intravision && battle->check_target( src_bl, &sd->bl, BCT_ENEMY ) > 0 ) + if( clif->ally_only && !sd->sc.data[SC_CLAIRVOYANCE] && !sd->special_state.intravision && battle->check_target( src_bl, &sd->bl, BCT_ENEMY ) > 0 ) return 0; WFIFOHEAD(fd, len); -- cgit v1.2.3-60-g2f50 From 763102b807239809d318add3fae5629bfd50a78b Mon Sep 17 00:00:00 2001 From: malufett Date: Thu, 9 Jan 2014 22:12:22 +0800 Subject: Fixed Bug#7826 -http://hercules.ws/board/tracker/issue-7826-card-compound/?gopid=21081#entry21081 Signed-off-by: malufett --- src/map/clif.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index fc5448472..2a2151eb0 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5947,9 +5947,15 @@ void clif_use_card(struct map_session_data *sd,int idx) if( j == sd->inventory_data[i]->slot ) // No room continue; + if( sd->status.inventory[i].equip > 0 ) // Do not check items that are already equipped + continue; + WFIFOW(fd,4+c*2)=i+2; c++; } + + if( !c ) return; // no item is available for card insertion + WFIFOW(fd,2)=4+c*2; WFIFOSET(fd,WFIFOW(fd,2)); } -- cgit v1.2.3-60-g2f50