diff options
| author | shennetsind <ind@henn.et> | 2013-09-28 12:49:51 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-28 12:49:51 -0300 |
| commit | 8bed1531de1deceae20e09bc2d59470f586a94f6 (patch) | |
| tree | 5909c98606ebb26a70c15e16b6a26c8cac081088 /src/map/skill.c | |
| parent | e4b0f270ad0fabab869c1a803fa8e4a73f198760 (diff) | |
| parent | f8f073bc7ebd1bc5cf19e8ea9b72a54bba7fab8b (diff) | |
| download | hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.gz hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.bz2 hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.tar.xz hercules-8bed1531de1deceae20e09bc2d59470f586a94f6.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 5c4dddc6f..96c439741 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5743,7 +5743,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui break; case MO_KITRANSLATION: - if(dstsd && (dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER) { + if(dstsd && ((dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER || (dstsd->class_&MAPID_UPPERMASK)!=MAPID_REBELLION)) { pc->addspiritball(dstsd,skill->get_time(skill_id,skill_lv),5); } break; @@ -5758,7 +5758,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui case MO_ABSORBSPIRITS: i = 0; - if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m)) && (dstsd->class_&MAPID_BASEMASK)!=MAPID_GUNSLINGER) + if (dstsd && dstsd->spiritball && (sd == dstsd || map_flag_vs(src->m)) && ((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] i = dstsd->spiritball * 7; pc->delspiritball(dstsd,dstsd->spiritball,0); |