diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/skill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 96ade3908..88ca45ae5 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6146,7 +6146,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin { int sp = 0; if ( dstsd && dstsd->spiritball - && (sd == dstsd || map_flag_vs(src->m) || (sd->duel_group && sd->duel_group == dstsd->duel_group)) + && (sd == dstsd || map_flag_vs(src->m) || (sd && sd->duel_group && sd->duel_group == dstsd->duel_group)) && ((dstsd->class_&MAPID_BASEMASK) != MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK) != MAPID_REBELLION) ) { // split the if for readability, and included gunslingers in the check so that their coins cannot be removed [Reddozen] |