summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-08-08 19:30:54 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-08-08 19:30:54 +0200
commit73089923e91b88bb2470cd7abab8616b5e68d374 (patch)
tree56923692e7feb7bae6424725590601fe16837bab /src
parentd9941f08b517529186dd453fadfa059ac4895eac (diff)
downloadhercules-73089923e91b88bb2470cd7abab8616b5e68d374.tar.gz
hercules-73089923e91b88bb2470cd7abab8616b5e68d374.tar.bz2
hercules-73089923e91b88bb2470cd7abab8616b5e68d374.tar.xz
hercules-73089923e91b88bb2470cd7abab8616b5e68d374.zip
- Fix Expiatio Range (bug:7778)
- Fix Dark Illusion Range - Fix Absorb Spirit Sphere on Duels (bug:4085)
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 4adb11fde..e8217d5d3 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6011,7 +6011,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
case MO_ABSORBSPIRITS:
{
int sp = 0;
- if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m)) && ((dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK)!=MAPID_REBELLION))
+ if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m) || (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]
sp = dstsd->spiritball * 7;
pc->delspiritball(dstsd,dstsd->spiritball,0);