|
@@ -10546,6 +10546,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
|
if (j > 8)
|
|
if (j > 8)
|
|
j = 0;
|
|
j = 0;
|
|
if ((dstsd = g->guild.member[i].sd) != nullptr && sd != dstsd && !dstsd->state.autotrade && !pc_isdead(dstsd)) {
|
|
if ((dstsd = g->guild.member[i].sd) != nullptr && sd != dstsd && !dstsd->state.autotrade && !pc_isdead(dstsd)) {
|
|
|
|
+ if (dstsd->status.disable_call)
|
|
|
|
+ continue;
|
|
if (map_getmapflag(dstsd->bl.m, MF_NOWARP) && !map_flag_gvg2(dstsd->bl.m))
|
|
if (map_getmapflag(dstsd->bl.m, MF_NOWARP) && !map_flag_gvg2(dstsd->bl.m))
|
|
continue;
|
|
continue;
|
|
if (!pc_job_can_entermap((enum e_job)dstsd->status.class_, src->m, pc_get_group_level(dstsd)))
|
|
if (!pc_job_can_entermap((enum e_job)dstsd->status.class_, src->m, pc_get_group_level(dstsd)))
|
|
@@ -13255,7 +13257,7 @@ TIMER_FUNC(skill_castend_id){
|
|
if (sd) {
|
|
if (sd) {
|
|
map_session_data *p_sd = pc_get_partner(sd);
|
|
map_session_data *p_sd = pc_get_partner(sd);
|
|
|
|
|
|
- if (p_sd && p_sd->state.autotrade) {
|
|
|
|
|
|
+ if (p_sd != nullptr && (p_sd->state.autotrade || p_sd->status.disable_call)) {
|
|
fail = true;
|
|
fail = true;
|
|
break;
|
|
break;
|
|
} else
|
|
} else
|
|
@@ -13267,7 +13269,7 @@ TIMER_FUNC(skill_castend_id){
|
|
map_session_data *f_sd = pc_get_father(sd);
|
|
map_session_data *f_sd = pc_get_father(sd);
|
|
map_session_data *m_sd = pc_get_mother(sd);
|
|
map_session_data *m_sd = pc_get_mother(sd);
|
|
|
|
|
|
- if ((f_sd && f_sd->state.autotrade) || (m_sd && m_sd->state.autotrade)) {
|
|
|
|
|
|
+ if ((f_sd != nullptr && (f_sd->state.autotrade || f_sd->status.disable_call)) || (m_sd != nullptr && (m_sd->state.autotrade || m_sd->status.disable_call))) {
|
|
fail = true;
|
|
fail = true;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
@@ -13277,7 +13279,7 @@ TIMER_FUNC(skill_castend_id){
|
|
if (sd) {
|
|
if (sd) {
|
|
map_session_data *c_sd = pc_get_child(sd);
|
|
map_session_data *c_sd = pc_get_child(sd);
|
|
|
|
|
|
- if (c_sd && c_sd->state.autotrade) {
|
|
|
|
|
|
+ if (c_sd != nullptr && (c_sd->state.autotrade || c_sd->status.disable_call)) {
|
|
fail = true;
|
|
fail = true;
|
|
break;
|
|
break;
|
|
}
|
|
}
|