diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 36fc5f13fe..6c224de5c0 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -14004,12 +14004,12 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui case BO_ACIDIFIED_ZONE_GROUND: case BO_ACIDIFIED_ZONE_WIND: case BO_ACIDIFIED_ZONE_FIRE: - case SOA_TOTEM_OF_TUTELARY: case EM_DIAMOND_STORM: case EM_LIGHTNING_LAND: case EM_VENOM_SWAMP: case EM_CONFLAGRATION: case EM_TERRA_DRIVE: + case SOA_TOTEM_OF_TUTELARY: flag|=1;//Set flag to 1 to prevent deleting ammo (it will be deleted on group-delete). [[fallthrough]]; case GS_GROUNDDRIFT: //Ammo should be deleted right away. @@ -14018,13 +14018,6 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui skill_unitsetting(src,skill_id,skill_lv,x,y,0); break; - case SOA_TALISMAN_OF_BLACK_TORTOISE: - if (sc && (sc->getSCE(SC_T_THIRD_GOD) && !sc->getSCE(SC_T_FOURTH_GOD) && !sc->getSCE(SC_T_FIFTH_GOD))){ - sc_start(src, src, skill_get_sc(skill_id), 100, skill_lv, skill_get_time2(skill_id, skill_lv)); - } - skill_unitsetting(src,skill_id,skill_lv,x,y,0); - break; - case WZ_ICEWALL: flag|=1; if(skill_unitsetting(src,skill_id,skill_lv,x,y,0)) @@ -14794,6 +14787,13 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui } break; + case SOA_TALISMAN_OF_BLACK_TORTOISE: + if (sc && (sc->getSCE(SC_T_THIRD_GOD) && !sc->getSCE(SC_T_FOURTH_GOD) && !sc->getSCE(SC_T_FIFTH_GOD))){ + sc_start(src, src, skill_get_sc(skill_id), 100, skill_lv, skill_get_time2(skill_id, skill_lv)); + } + skill_unitsetting(src,skill_id,skill_lv,x,y,0); + break; + default: ShowWarning("skill_castend_pos2: Unknown skill used:%d\n",skill_id); return 1;