5 files changed, 28 insertions, 7 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 34e92bee0..1ba89f8c0 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -1125,9 +1125,12 @@ bool chrif_save_scdata(struct map_session_data *sd) { //parses the sc_data of th
 			continue;
 		if (sc->data[i]->timer != INVALID_TIMER) {
 			td = timer->get(sc->data[i]->timer);
-			if (td == NULL || td->func != status->change_timer || DIFF_TICK(td->tick,tick) < 0)
+			if (td == NULL || td->func != status->change_timer)
 				continue;
-			data.tick = DIFF_TICK32(td->tick,tick); //Duration that is left before ending.
+			if (DIFF_TICK32(td->tick,tick) > 0)
+				data.tick = DIFF_TICK32(td->tick,tick); //Duration that is left before ending.
+			else
+				data.tick = 0; //Negative tick does not necessarily mean that sc has expired
 		} else
 			data.tick = -1; //Infinite duration
 		data.type = i;
diff --git a/src/map/map.c b/src/map/map.c
index 5fa8779eb..045233e91 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2586,6 +2586,8 @@ int map_getcellp(struct map_data* m,int16 x,int16 y,cell_chk cellchk) {
 		return (cell.nochat);
 	case CELL_CHKICEWALL:
 		return (cell.icewall);
+	case CELL_CHKNOICEWALL:
+		return (cell.noicewall);
 
 		// special checks
 	case CELL_CHKPASS:
@@ -2645,6 +2647,8 @@ void map_setcell(int16 m, int16 x, int16 y, cell_t cell, bool flag) {
 	case CELL_NOVENDING:     map->list[m].cell[j].novending = flag;     break;
 	case CELL_NOCHAT:        map->list[m].cell[j].nochat = flag;        break;
 	case CELL_ICEWALL:       map->list[m].cell[j].icewall = flag;       break;
+	case CELL_NOICEWALL:     map->list[m].cell[j].noicewall = flag;     break;
+
 	default:
 		ShowWarning("map_setcell: invalid cell type '%d'\n", (int)cell);
 		break;
diff --git a/src/map/map.h b/src/map/map.h
index 751fef67e..11dd6ce82 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -444,6 +444,7 @@ typedef enum {
 	CELL_NOVENDING,
 	CELL_NOCHAT,
 	CELL_ICEWALL,
+	CELL_NOICEWALL,
 
 } cell_t;
 
@@ -467,6 +468,7 @@ typedef enum {
 	CELL_CHKNOVENDING,
 	CELL_CHKNOCHAT,
 	CELL_CHKICEWALL,
+	CELL_CHKNOICEWALL,
 
 } cell_chk;
 
@@ -484,7 +486,8 @@ struct mapcell {
 		landprotector : 1,
 		novending : 1,
 		nochat : 1,
-		icewall : 1;
+		icewall : 1,
+		noicewall : 1;
 
 #ifdef CELL_NOSTACK
 	int cell_bl; //Holds amount of bls in this cell.
diff --git a/src/map/skill.c b/src/map/skill.c
index 0fe4b99ea..42aae546d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -10078,7 +10078,6 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 		case MG_THUNDERSTORM:
 
 		case AL_PNEUMA:
-		case WZ_ICEWALL:
 		case WZ_FIREPILLAR:
 		case WZ_QUAGMIRE:
 		case WZ_VERMILION:
@@ -10187,6 +10186,11 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 				sc_start(src,src,SC_NO_SWITCH_EQUIP,100,0,skill->get_time(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) )
+				map->list[src->m].setcell(src->m, x, y, CELL_NOICEWALL, true);
+			break;
 		case RG_GRAFFITI:			/* Graffiti [Valaris] */
 			skill->clear_unitgroup(src);
 			skill->unitsetting(src,skill_id,skill_lv,x,y,0);
@@ -10995,11 +10999,11 @@ struct skill_unit_group* skill_unitsetting(struct block_list *src, uint16 skill_
 				val1 += pc->checkskill(sd,BA_MUSICALLESSON);
 			break;
 		case DC_SERVICEFORYOU:
-			val1 = 15+skill_lv+(st->int_/10); // MaxSP percent increase TO-DO: this INT bonus value is guessed
+			val1 = 15+skill_lv+(st->int_/10); // MaxSP percent increase
 			val2 = 20+3*skill_lv+(st->int_/10); // SP cost reduction
 			if(sd){
-				val1 += (pc->checkskill(sd,DC_DANCINGLESSON) + 1) / 2;
-				val2 += (pc->checkskill(sd,DC_DANCINGLESSON) + 1) / 2;
+				val1 += pc->checkskill(sd,DC_DANCINGLESSON) / 2;
+				val2 += pc->checkskill(sd,DC_DANCINGLESSON) / 2;
 			}
 			break;
 		case BA_ASSASSINCROSS:
@@ -15626,6 +15630,7 @@ int skill_delunit (struct skill_unit* su) {
 		}
 			break;
 		case WZ_ICEWALL:
+			map->list[su->bl.m].setcell(su->bl.m, su->bl.x, su->bl.y, CELL_NOICEWALL, false);
 			map->setgatcell(su->bl.m,su->bl.x,su->bl.y,su->val2);
 			clif->changemapcell(0,su->bl.m,su->bl.x,su->bl.y,su->val2,ALL_SAMEMAP); // hack to avoid clientside cell bug
 			skill->unitsetmapcell(su,WZ_ICEWALL,group->skill_lv,CELL_ICEWALL,false);
diff --git a/src/map/unit.c b/src/map/unit.c
index b4653df00..849e9348f 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1584,6 +1584,12 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, ui
 			clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
 			return 0;
 		}
+		/**
+		 * "WHY IS IT HEREE": ice wall cannot be canceled past this point, the client displays the animation even,
+		 * if we cancel it from castend_pos, so it has to be here for it to not display the animation.
+		 **/
+		if ( skill_id == WZ_ICEWALL && map->getcell(src->m, skill_x, skill_y, CELL_CHKNOICEWALL) )
+			return 0;
 	}
 
 	if (!status->check_skilluse(src, NULL, skill_id, 0))