# This patch file was generated by NetBeans IDE

# Following Index: paths are relative to: /home/lighta/Documents/Myscript/RO/Servs/rathena

# This patch can be applied using context Tools: Patch action on respective folder.

# It uses platform neutral UTF-8 encoding and \n newlines.

# Above lines and this line are ignored by the patching process.

Index: CMakeLists.txt

--- CMakeLists.txt Base (BASE)

+++ CMakeLists.txt Locally Modified (Based On LOCAL)

@@ -481,7 +481,6 @@

 	"${CMAKE_CURRENT_SOURCE_DIR}/README.txt"

 	"${CMAKE_CURRENT_SOURCE_DIR}/runserver-sql.bat"

 	"${CMAKE_CURRENT_SOURCE_DIR}/serv.bat"

-	"${CMAKE_CURRENT_SOURCE_DIR}/start"

 	"${CMAKE_CURRENT_SOURCE_DIR}/zlib1.dll"

 	)

 set( RUNTIME_DIRECTORIES

Index: conf/char_athena.conf

--- conf/char_athena.conf Base (BASE)

+++ conf/char_athena.conf Locally Modified (Based On LOCAL)

@@ -165,7 +165,7 @@

 // NOTE: Requires client 2011-03-09aragexeRE or newer.

 // A window is opened before you can select your character and you will have to enter a pincode by using only your mouse.

 // Default: yes

-pincode_enabled: yes

+pincode_enabled: no

 // How often does a user have to change his pincode?

 // 0: never (default)

Index: db/re/skill_db.txt

--- db/re/skill_db.txt Base (BASE)

+++ db/re/skill_db.txt Locally Modified (Based On LOCAL)

@@ -1128,7 +1128,7 @@

 8025,7,6,2,4:0:4:0:4,0,0,5,1,no,0,0,0,magic,0,	MH_XENO_SLASHER,Xeno Slasher

 8026,5:5:7:7:9,6,16,0,0x1,0,5,1,no,0,0,0,magic,0,	MH_SILENT_BREEZE,Silent Breeze

 8027,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,		MH_STYLE_CHANGE,Style Change

-8028,1,8,1,0,0,0,5,1,no,0,0,0,weapon,0,		MH_SONIC_CRAW,Sonic Claw

+8028,1,8,1,0,0,0,5,1,no,0,0x200,0,weapon,0,		MH_SONIC_CRAW,Sonic Claw

 8029,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,	MH_SILVERVEIN_RUSH,Silver Bain Rush

 8030,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,	MH_MIDNIGHT_FRENZY,Midnight Frenzy

 8031,5:6:7:8:9,6,1,0,0,0,5,1,no,0,0,0,weapon,3,	MH_STAHL_HORN,Steel Horn

@@ -1136,7 +1136,7 @@

 8033,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		MH_STEINWAND,Stone Wall

 8034,9,6,1,6,0x2,1:1:1:1:2,5,1,no,0,0,0,magic,0,	MH_HEILIGE_STANGE,Holy Pole

 8035,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		MH_ANGRIFFS_MODUS,Attack Mode

-8036,3:4:5:6:7,6,1,0,0,0,5,1,no,0,0,0,weapon,0,	MH_TINDER_BREAKER,Tinder Breaker

+8036,3:4:5:6:7,6,1,0,0,0,5,1,no,0,0x200,0,weapon,0,	MH_TINDER_BREAKER,Tinder Breaker

 8037,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,	MH_CBC,Continual Break Combo

 8038,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0,	MH_EQC,Eternal Quick Combo

 8039,0,6,4,3,0x2,1:1:1:2:2,5,1,no,0,0,0,weapon,0,	MH_MAGMA_FLOW,Magma Flow

Index: npc/re/tester.txt

--- npc/re/tester.txt No Base Revision

+++ npc/re/tester.txt Locally New

@@ -0,0 +1,6 @@

+new_1-1,61,100,3	script	Hotel Keeper#bra1	478,{

+	OnNPCKillEvent:

+	.count++;

+	dispbottom "You have killed mobid :"+killedrid+" count="+.count;

+	end;

+}

Index: src/map/atcommand.c

--- src/map/atcommand.c Base (BASE)

+++ src/map/atcommand.c Locally Modified (Based On LOCAL)

@@ -4501,7 +4501,7 @@

 	}

 	//Duration of INT_MAX to specify infinity.

-	sc_start4(&pl_sd->bl,SC_JAILED,100,INT_MAX,m_index,x,y,1000);

+	sc_start4(NULL,&pl_sd->bl,SC_JAILED,100,INT_MAX,m_index,x,y,1000);

 	clif_displaymessage(pl_sd->fd, msg_txt(117)); // GM has send you in jails.

 	clif_displaymessage(fd, msg_txt(118)); // Player warped in jails.

 	return 0;

@@ -4540,7 +4540,7 @@

 	}

 	//Reset jail time to 1 sec.

-	sc_start(&pl_sd->bl,SC_JAILED,100,1,1000);

+	sc_start(&pl_sd->bl,&pl_sd->bl,SC_JAILED,100,1,1000);

 	clif_displaymessage(pl_sd->fd, msg_txt(120)); // A GM has discharged you from jail.

 	clif_displaymessage(fd, msg_txt(121)); // Player unjailed.

 	return 0;

@@ -4653,7 +4653,7 @@

 			break;

 	}

-	sc_start4(&pl_sd->bl,SC_JAILED,100,jailtime,m_index,x,y,jailtime?60000:1000); //jailtime = 0: Time was reset to 0. Wait 1 second to warp player out (since it's done in status_change_timer).

+	sc_start4(NULL,&pl_sd->bl,SC_JAILED,100,jailtime,m_index,x,y,jailtime?60000:1000); //jailtime = 0: Time was reset to 0. Wait 1 second to warp player out (since it's done in status_change_timer).

 	return 0;

 }

@@ -5604,7 +5604,7 @@

 	sd->state.autotrade = 1;

 	if( battle_config.at_timeout ) {

 		int timeout = atoi(message);

-		status_change_start(&sd->bl, SC_AUTOTRADE, 10000, 0, 0, 0, 0, ((timeout > 0) ? min(timeout,battle_config.at_timeout) : battle_config.at_timeout) * 60000, 0);

+		status_change_start(NULL,&sd->bl, SC_AUTOTRADE, 10000, 0, 0, 0, 0, ((timeout > 0) ? min(timeout,battle_config.at_timeout) : battle_config.at_timeout) * 60000, 0);

 	}

 	clif_authfail_fd(sd->fd, 15);

@@ -6332,7 +6332,7 @@

 	md->deletetimer=add_timer(tick+(duration*60000),mob_timer_delete,md->bl.id,0);

 	clif_specialeffect(&md->bl,344,AREA);

 	mob_spawn(md);

-	sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);

+	sc_start4(NULL,&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);

 	clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,md->bl.x,md->bl.y,tick);

 	clif_displaymessage(fd, msg_txt(39));	// All monster summoned!

@@ -6516,7 +6516,7 @@

 	if( pl_sd->status.manner < manner ) {

 		pl_sd->status.manner -= manner;

-		sc_start(&pl_sd->bl,SC_NOCHAT,100,0,0);

+		sc_start(&pl_sd->bl,&pl_sd->bl,SC_NOCHAT,100,0,0);

 	} else {

 		pl_sd->status.manner = 0;

 		status_change_end(&pl_sd->bl, SC_NOCHAT, INVALID_TIMER);

@@ -7326,7 +7326,7 @@

 	if (id != bl->id && !pc_get_group_level(pl_sd)) {

 		pl_sd->status.manner -= time;

 		if (pl_sd->status.manner < 0)

-			sc_start(&pl_sd->bl,SC_NOCHAT,100,0,0);

+			sc_start(&pl_sd->bl,&pl_sd->bl,SC_NOCHAT,100,0,0);

 		else

 			status_change_end(&pl_sd->bl, SC_NOCHAT, INVALID_TIMER);

 	}

Index: src/map/battle.c

--- src/map/battle.c Base (BASE)

+++ src/map/battle.c Locally Modified (Based On LOCAL)

@@ -837,7 +837,7 @@

 		{

 			clif_skill_nodamage(bl,src,GC_WEAPONBLOCKING,1,1);

 			d->dmg_lv = ATK_BLOCK;

-			sc_start2(bl,SC_COMBO,100,GC_WEAPONBLOCKING,src->id,2000);

+			sc_start2(src,bl,SC_COMBO,100,GC_WEAPONBLOCKING,src->id,2000);

 			return 0;

 		}

 		if( (sce=sc->data[SC_AUTOGUARD]) && flag&BF_WEAPON && !(skill_get_nk(skill_id)&NK_NO_CARDFIX_ATK) && rnd()%100 < sce->val2 )

@@ -862,7 +862,7 @@

 			clif_skill_nodamage(bl, bl, RK_MILLENNIUMSHIELD, 1, 1);

 			sce->val3 -= damage; // absorb damage

 			d->dmg_lv = ATK_BLOCK;

-			sc_start(bl,SC_STUN,15,0,skill_get_time2(RK_MILLENNIUMSHIELD,sce->val1)); // There is a chance to be stuned when one shield is broken.

+			sc_start(src,bl,SC_STUN,15,0,skill_get_time2(RK_MILLENNIUMSHIELD,sce->val1)); // There is a chance to be stuned when one shield is broken.

 			if( sce->val3 <= 0 ) { // Shield Down

 				sce->val2--;

 				if( sce->val2 > 0 ) {

@@ -888,7 +888,7 @@

 			if (sd && pc_issit(sd)) pc_setstand(sd); //Stand it to dodge.

 			clif_skill_nodamage(bl,bl,TK_DODGE,1,1);

 			if (!sc->data[SC_COMBO])

-				sc_start4(bl, SC_COMBO, 100, TK_JUMPKICK, src->id, 1, 0, 2000);

+				sc_start4(src,bl, SC_COMBO, 100, TK_JUMPKICK, src->id, 1, 0, 2000);

 			return 0;

 		}

@@ -1070,12 +1070,12 @@

 			if( src->type == BL_PC ) {

 				TBL_PC *ssd = BL_CAST(BL_PC, src);

 				if (ssd && ssd->status.weapon != W_BOW)

-					skill_break_equip(src, EQP_WEAPON, 3000, BCT_SELF);

+					skill_break_equip(src,src, EQP_WEAPON, 3000, BCT_SELF);

 			} else

-				skill_break_equip(src, EQP_WEAPON, 3000, BCT_SELF);

+				skill_break_equip(src,src, EQP_WEAPON, 3000, BCT_SELF);

 			// 30% chance to reduce monster's ATK by 25% for 10 seconds.

 			if( src->type == BL_MOB )

-				sc_start(src, SC_STRIPWEAPON, 30, 0, skill_get_time2(RK_STONEHARDSKIN, sce->val1));

+				sc_start(src,src, SC_STRIPWEAPON, 30, 0, skill_get_time2(RK_STONEHARDSKIN, sce->val1));

 			if( sce->val2 <= 0 )

 				status_change_end(bl, SC_STONEHARDSKIN, INVALID_TIMER);

 		}

@@ -1197,7 +1197,7 @@

 					}

 		}

 		if( sc->data[SC_POISONINGWEAPON] && skill_id != GC_VENOMPRESSURE && (flag&BF_WEAPON) && damage > 0 && rnd()%100 < sc->data[SC_POISONINGWEAPON]->val3 )

-			sc_start(bl,sc->data[SC_POISONINGWEAPON]->val2,100,sc->data[SC_POISONINGWEAPON]->val1,skill_get_time2(GC_POISONINGWEAPON, 1));

+			sc_start(src,bl,sc->data[SC_POISONINGWEAPON]->val2,100,sc->data[SC_POISONINGWEAPON]->val1,skill_get_time2(GC_POISONINGWEAPON, 1));

 		if( sc->data[SC__DEADLYINFECT] && damage > 0 && rnd()%100 < 65 + 5 * sc->data[SC__DEADLYINFECT]->val1 )

 			status_change_spread(src, bl);

                 if (sc->data[SC_STYLE_CHANGE] && rnd()%2) {

@@ -4828,11 +4828,11 @@

 		uint16 skill_lv = tsc->data[SC_BLADESTOP_WAIT]->val1;

 		int duration = skill_get_time2(MO_BLADESTOP,skill_lv);

 		status_change_end(target, SC_BLADESTOP_WAIT, INVALID_TIMER);

-		if(sc_start4(src, SC_BLADESTOP, 100, sd?pc_checkskill(sd, MO_BLADESTOP):5, 0, 0, target->id, duration))

+		if(sc_start4(src,src, SC_BLADESTOP, 100, sd?pc_checkskill(sd, MO_BLADESTOP):5, 0, 0, target->id, duration))

 	  	{	//Target locked.

 			clif_damage(src, target, tick, sstatus->amotion, 1, 0, 1, 0, 0); //Display MISS.

 			clif_bladestop(target, src->id, 1);

-			sc_start4(target, SC_BLADESTOP, 100, skill_lv, 0, 0, src->id, duration);

+			sc_start4(src,target, SC_BLADESTOP, 100, skill_lv, 0, 0, src->id, duration);

 			return ATK_BLOCK;

 		}

 	}

Index: src/map/chrif.c

--- src/map/chrif.c Base (BASE)

+++ src/map/chrif.c Locally Modified (Based On LOCAL)

@@ -1230,7 +1230,7 @@

 	for (i = 0; i < count; i++) {

 		data = (struct status_change_data*)RFIFOP(fd,14 + i*sizeof(struct status_change_data));

-		status_change_start(&sd->bl, (sc_type)data->type, 10000, data->val1, data->val2, data->val3, data->val4, data->tick, 15);

+		status_change_start(NULL,&sd->bl, (sc_type)data->type, 10000, data->val1, data->val2, data->val3, data->val4, data->tick, 15);

 	}

 #endif

Index: src/map/clif.c

--- src/map/clif.c Base (BASE)

+++ src/map/clif.c Locally Modified (Based On LOCAL)

@@ -9275,14 +9275,14 @@

 			clif_status_load(&sd->bl, SI_WUGRIDER, 1);

 		if(sd->status.manner < 0)

-			sc_start(&sd->bl,SC_NOCHAT,100,0,0);

+			sc_start(&sd->bl,&sd->bl,SC_NOCHAT,100,0,0);

 		//Auron reported that This skill only triggers when you logon on the map o.O [Skotlex]

 		if ((lv = pc_checkskill(sd,SG_KNOWLEDGE)) > 0) {

 			if(sd->bl.m == sd->feel_map[0].m

 				|| sd->bl.m == sd->feel_map[1].m

 				|| sd->bl.m == sd->feel_map[2].m)

-				sc_start(&sd->bl, SC_KNOWLEDGE, 100, lv, skill_get_time(SG_KNOWLEDGE, lv));

+				sc_start(&sd->bl,&sd->bl, SC_KNOWLEDGE, 100, lv, skill_get_time(SG_KNOWLEDGE, lv));

 		}

 		if(sd->pd && sd->pd->pet.intimate > 900)

@@ -12829,7 +12829,7 @@

 			if( percent && ( percent%100 ) == 0 )

 			{// 10.0%, 20.0%, ..., 90.0%

-				sc_start(&sd->bl, status_skill2sc(MO_EXPLOSIONSPIRITS), 100, 17, skill_get_time(MO_EXPLOSIONSPIRITS, 5)); //Lv17-> +50 critical (noted by Poki) [Skotlex]

+				sc_start(&sd->bl,&sd->bl, status_skill2sc(MO_EXPLOSIONSPIRITS), 100, 17, skill_get_time(MO_EXPLOSIONSPIRITS, 5)); //Lv17-> +50 critical (noted by Poki) [Skotlex]

 				clif_skill_nodamage(&sd->bl, &sd->bl, MO_EXPLOSIONSPIRITS, 5, 1);  // prayer always shows successful Lv5 cast and disregards noskill restrictions

 			}

 		}

Index: src/map/guild.c

--- src/map/guild.c Base (BASE)

+++ src/map/guild.c Locally Modified (Based On LOCAL)

@@ -1307,7 +1307,7 @@

 	}

 	group = skill_unitsetting(&sd->bl,skill_id,skill_lv,sd->bl.x,sd->bl.y,0);

 	if( group ) {

-		sc_start4(&sd->bl,type,100,(battle_config.guild_aura&16)?0:skill_lv,0,0,group->group_id,600000);//duration doesn't matter these status never end with val4

+		sc_start4(NULL,&sd->bl,type,100,(battle_config.guild_aura&16)?0:skill_lv,0,0,group->group_id,600000);//duration doesn't matter these status never end with val4

 	}

 	return;

 }

Index: src/map/homunculus.c

--- src/map/homunculus.c Base (BASE)

+++ src/map/homunculus.c Locally Modified (Based On LOCAL)

@@ -783,7 +783,7 @@

 	map_addiddb(&hd->bl);

 	status_calc_homunculus(hd,1);

 	if(hom->class_ == 6052) //eleanor

-	    sc_start(&hd->bl, SC_STYLE_CHANGE, 100, MH_MD_FIGHTING, -1);

+	    sc_start(&hd->bl,&hd->bl, SC_STYLE_CHANGE, 100, MH_MD_FIGHTING, -1);

 	hd->hungry_timer = INVALID_TIMER;

 	return 0;

Index: src/map/map.h

--- src/map/map.h Base (BASE)

+++ src/map/map.h Locally Modified (Based On LOCAL)

@@ -432,7 +432,8 @@

 	LOOK_SHOES,

 	LOOK_BODY,			//Purpose Unknown. Doesen't appear to do anything.

 	LOOK_RESET_COSTUMES,//Makes all headgear sprites on player vanish when activated.

-	LOOK_ROBE

+	LOOK_ROBE,

+	LOOK_FLOOR

 };

 // used by map_setcell()

Index: src/map/mercenary.c

--- src/map/mercenary.c Base (BASE)

+++ src/map/mercenary.c Locally Modified (Based On LOCAL)

@@ -363,7 +363,7 @@

 	const enum sc_type scs[] = { SC_MERC_FLEEUP, SC_MERC_ATKUP, SC_MERC_HPUP, SC_MERC_SPUP, SC_MERC_HITUP };

 	int index = rnd() % ARRAYLENGTH(scs);

-    sc_start(&md->bl, scs[index], 100, rnd() % 5, 600000);

+	sc_start(&md->bl,&md->bl, scs[index], 100, rnd() % 5, 600000);

 	return 0;

 }

Index: src/map/mob.c

--- src/map/mob.c Base (BASE)

+++ src/map/mob.c Locally Modified (Based On LOCAL)

@@ -415,7 +415,7 @@

 		return true;

 	} while(0);

-	status_change_start(target, SC_KSPROTECTED, 10000, sd->bl.id, sd->state.noks, sd->status.party_id, sd->status.guild_id, battle_config.ksprotection, 0);

+	status_change_start(src, target, SC_KSPROTECTED, 10000, sd->bl.id, sd->state.noks, sd->status.party_id, sd->status.guild_id, battle_config.ksprotection, 0);

 	return false;

 }

@@ -505,7 +505,7 @@

 		if (class_ < 0 && battle_config.dead_branch_active)

 			//Behold Aegis's masterful decisions yet again...

 			//"I understand the "Aggressive" part, but the "Can Move" and "Can Attack" is just stupid" - Poki#3

-			sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE|MD_CANATTACK|MD_CANMOVE|MD_ANGRY, 0, 60000);

+			sc_start4(NULL,&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE|MD_CANATTACK|MD_CANMOVE|MD_ANGRY, 0, 60000);

 	}

 	return (md) ? md->bl.id : 0; // id of last spawned mob

@@ -2932,17 +2932,17 @@

 			switch (battle_config.slaves_inherit_mode) {

 			case 1: //Always aggressive

 				if (!(md->status.mode&MD_AGGRESSIVE))

-					sc_start4(&md->bl, SC_MODECHANGE, 100,1,0, MD_AGGRESSIVE, 0, 0);

+					sc_start4(NULL,&md->bl, SC_MODECHANGE, 100,1,0, MD_AGGRESSIVE, 0, 0);

 				break;

 			case 2: //Always passive

 				if (md->status.mode&MD_AGGRESSIVE)

-					sc_start4(&md->bl, SC_MODECHANGE, 100,1,0, 0, MD_AGGRESSIVE, 0);

+					sc_start4(NULL,&md->bl, SC_MODECHANGE, 100,1,0, 0, MD_AGGRESSIVE, 0);

 				break;

 			default: //Copy master.

 				if (md2->status.mode&MD_AGGRESSIVE)

-					sc_start4(&md->bl, SC_MODECHANGE, 100,1,0, MD_AGGRESSIVE, 0, 0);

+					sc_start4(NULL,&md->bl, SC_MODECHANGE, 100,1,0, MD_AGGRESSIVE, 0, 0);

 				else

-					sc_start4(&md->bl, SC_MODECHANGE, 100,1,0, 0, MD_AGGRESSIVE, 0);

+					sc_start4(NULL,&md->bl, SC_MODECHANGE, 100,1,0, 0, MD_AGGRESSIVE, 0);

 				break;

 			}

 		}

Index: src/map/party.c

--- src/map/party.c Base (BASE)

+++ src/map/party.c Locally Modified (Based On LOCAL)

@@ -832,7 +832,7 @@

 			case TK_COUNTER: //Increase Triple Attack rate of Monks.

 				if((p_sd->class_&MAPID_UPPERMASK) == MAPID_MONK

 					&& pc_checkskill(p_sd,MO_TRIPLEATTACK)) {

-					sc_start4(&p_sd->bl,SC_SKILLRATE_UP,100,MO_TRIPLEATTACK,

+					sc_start4(&p_sd->bl,&p_sd->bl,SC_SKILLRATE_UP,100,MO_TRIPLEATTACK,

 						50+50*skill_lv, //+100/150/200% rate

 						0,0,skill_get_time(SG_FRIEND, 1));

 				}

@@ -841,7 +841,7 @@

 				if((p_sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR

 					&& sd->sc.data[SC_READYCOUNTER]

 					&& pc_checkskill(p_sd,SG_FRIEND)) {

-					sc_start4(&p_sd->bl,SC_SKILLRATE_UP,100,TK_COUNTER,

+					sc_start4(&p_sd->bl,&p_sd->bl,SC_SKILLRATE_UP,100,TK_COUNTER,

 						50+50*pc_checkskill(p_sd,SG_FRIEND), //+100/150/200% rate

 						0,0,skill_get_time(SG_FRIEND, 1));

 				}

Index: src/map/pc.c

--- src/map/pc.c Base (BASE)

+++ src/map/pc.c Locally Modified (Based On LOCAL)

@@ -1634,9 +1634,9 @@

 	// start new status change

 	if( new_overweight == 1 )

-		sc_start(&sd->bl, SC_WEIGHT50, 100, 0, 0);

+		sc_start(&sd->bl,&sd->bl, SC_WEIGHT50, 100, 0, 0);

 	else if( new_overweight == 2 )

-		sc_start(&sd->bl, SC_WEIGHT90, 100, 0, 0);

+		sc_start(&sd->bl,&sd->bl, SC_WEIGHT90, 100, 0, 0);

 	// update overweight status

 	sd->regen.state.overweight = new_overweight;

@@ -5617,16 +5617,16 @@

 	status_percent_heal(&sd->bl,100,100);

 	if((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE) {

-		sc_start(&sd->bl,status_skill2sc(PR_KYRIE),100,1,skill_get_time(PR_KYRIE,1));

-		sc_start(&sd->bl,status_skill2sc(PR_IMPOSITIO),100,1,skill_get_time(PR_IMPOSITIO,1));

-		sc_start(&sd->bl,status_skill2sc(PR_MAGNIFICAT),100,1,skill_get_time(PR_MAGNIFICAT,1));

-		sc_start(&sd->bl,status_skill2sc(PR_GLORIA),100,1,skill_get_time(PR_GLORIA,1));

-		sc_start(&sd->bl,status_skill2sc(PR_SUFFRAGIUM),100,1,skill_get_time(PR_SUFFRAGIUM,1));

+		sc_start(&sd->bl,&sd->bl,status_skill2sc(PR_KYRIE),100,1,skill_get_time(PR_KYRIE,1));

+		sc_start(&sd->bl,&sd->bl,status_skill2sc(PR_IMPOSITIO),100,1,skill_get_time(PR_IMPOSITIO,1));

+		sc_start(&sd->bl,&sd->bl,status_skill2sc(PR_MAGNIFICAT),100,1,skill_get_time(PR_MAGNIFICAT,1));

+		sc_start(&sd->bl,&sd->bl,status_skill2sc(PR_GLORIA),100,1,skill_get_time(PR_GLORIA,1));

+		sc_start(&sd->bl,&sd->bl,status_skill2sc(PR_SUFFRAGIUM),100,1,skill_get_time(PR_SUFFRAGIUM,1));

 		if (sd->state.snovice_dead_flag)

 			sd->state.snovice_dead_flag = 0; //Reenable steelbody resurrection on dead.

 	} else if( (sd->class_&MAPID_BASEMASK) == MAPID_TAEKWON ) {

-		sc_start(&sd->bl,status_skill2sc(AL_INCAGI),100,10,600000);

-		sc_start(&sd->bl,status_skill2sc(AL_BLESSING),100,10,600000);

+		sc_start(&sd->bl,&sd->bl,status_skill2sc(AL_INCAGI),100,10,600000);

+		sc_start(&sd->bl,&sd->bl,status_skill2sc(AL_BLESSING),100,10,600000);

 	}

 	clif_misceffect(&sd->bl,0);

 	npc_script_event(sd, NPCE_BASELVUP); //LORDALFA - LVLUPEVENT

@@ -6658,7 +6658,7 @@

 		if (battle_config.pk_mode&2) {

 			ssd->status.manner -= 5;

 			if(ssd->status.manner < 0)

-				sc_start(src,SC_NOCHAT,100,0,0);

+				sc_start(&sd->bl,src,SC_NOCHAT,100,0,0);

 #if 0

 			// PK/Karma system code (not enabled yet) [celest]

 			// originally from Kade Online, so i don't know if any of these is correct ^^;

@@ -6711,7 +6711,7 @@

 			clif_resurrection(&sd->bl, 1);

 			if(battle_config.pc_invincible_time)

 				pc_setinvincibletimer(sd, battle_config.pc_invincible_time);

-			sc_start(&sd->bl,status_skill2sc(MO_STEELBODY),100,1,skill_get_time(MO_STEELBODY,1));

+			sc_start(&sd->bl,&sd->bl,status_skill2sc(MO_STEELBODY),100,1,skill_get_time(MO_STEELBODY,1));

 			if(map_flag_gvg(sd->bl.m))

 				pc_respawn_timer(INVALID_TIMER, gettick(), sd->bl.id, 0);

 			return 0;

@@ -7726,7 +7726,7 @@

 			if( !sd->sc.data[SC_PUSH_CART] ) /* first time, so fill cart data */

 				clif_cartlist(sd);

 			clif_updatestatus(sd, SP_CARTINFO);

-			sc_start(&sd->bl, SC_PUSH_CART, 100, type, 0);

+			sc_start(&sd->bl,&sd->bl, SC_PUSH_CART, 100, type, 0);

 			clif_status_load_notick(&sd->bl, SI_ON_PUSH_CART,   2 , type, 0, 0);

 			if( sd->sc.data[SC_PUSH_CART] )/* forcefully update */

 				sd->sc.data[SC_PUSH_CART]->val1 = type;

@@ -9207,9 +9207,9 @@

 	heat = max(0,heat); // Avoid negative HEAT

 	if( heat >= limit[skill] )

-		sc_start(&sd->bl,SC_OVERHEAT,100,0,1000);

+		sc_start(&sd->bl,&sd->bl,SC_OVERHEAT,100,0,1000);

 	else

-		sc_start(&sd->bl,SC_OVERHEAT_LIMITPOINT,100,heat,30000);

+		sc_start(&sd->bl,&sd->bl,SC_OVERHEAT_LIMITPOINT,100,heat,30000);

 	return;

 }

Index: src/map/script.c

--- src/map/script.c Base (BASE)

+++ src/map/script.c Locally Modified (Based On LOCAL)

@@ -9877,7 +9877,7 @@

 	}

 	if( bl )

-		status_change_start(bl, type, 10000, val1, 0, 0, val4, tick, 2);

+		status_change_start(NULL, bl, type, 10000, val1, 0, 0, val4, tick, 2);

 	return 0;

 }

@@ -9916,7 +9916,7 @@

 	}

 	if( bl )

-		status_change_start(bl, type, rate, val1, 0, 0, val4, tick, 2);

+		status_change_start(NULL, bl, type, rate, val1, 0, 0, val4, tick, 2);

 	return 0;

 }

@@ -9957,7 +9957,7 @@

 	}

 	if( bl )

-		status_change_start(bl, type, 10000, val1, val2, val3, val4, tick, 2);

+		status_change_start(NULL, bl, type, 10000, val1, val2, val3, val4, tick, 2);

 	return 0;

 }

@@ -10029,7 +10029,7 @@

 		bl = map_id2bl(st->rid);

 	if (bl)

-		rate = status_get_sc_def(bl, (sc_type)type, 10000, 10000, 0);

+		rate = status_get_sc_def(NULL,bl, (sc_type)type, 10000, 10000, 0);

 	script_pushint(st,rate);

 	return 0;

@@ -13218,7 +13218,7 @@

 		md->deletetimer = add_timer(tick+(timeout>0?timeout*1000:60000),mob_timer_delete,md->bl.id,0);

 		mob_spawn (md); //Now it is ready for spawning.

 		clif_specialeffect(&md->bl,344,AREA);

-		sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);

+		sc_start4(NULL,&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);

 	}

 	return 0;

 }

@@ -15768,7 +15768,7 @@

 	tick = script_getnum(st,3);

 	val1 = script_getnum(st,4);

-	status_change_start(&sd->md->bl, type, 10000, val1, 0, 0, 0, tick, 2);

+	status_change_start(NULL, &sd->md->bl, type, 10000, val1, 0, 0, 0, tick, 2);

 	return 0;

 }

Index: src/map/skill.c

--- src/map/skill.c Base (BASE)

+++ src/map/skill.c Locally Modified (Based On LOCAL)

@@ -854,10 +854,10 @@

 				skill = skill_get_time2(status_sc2skill(type),7);

 				if (sd->addeff[i].flag&ATF_TARGET)

-					status_change_start(bl,type,rate,7,0,0,0,skill,0);

+					status_change_start(src, bl,type,rate,7,0,0,0,skill,0);

 				if (sd->addeff[i].flag&ATF_SELF)

-					status_change_start(src,type,rate,7,0,0,0,skill,0);

+					status_change_start(NULL, src,type,rate,7,0,0,0,skill,0);

 			}

 		}

@@ -873,9 +873,9 @@

 				skill = skill_get_time2(status_sc2skill(type),7);

 				if( sd->addeff3[i].target&ATF_TARGET )

-					status_change_start(bl,type,sd->addeff3[i].rate,7,0,0,0,skill,0);

+					status_change_start(src, bl,type,sd->addeff3[i].rate,7,0,0,0,skill,0);

 				if( sd->addeff3[i].target&ATF_SELF )

-					status_change_start(src,type,sd->addeff3[i].rate,7,0,0,0,skill,0);

+					status_change_start(src, src,type,sd->addeff3[i].rate,7,0,0,0,skill,0);

 			}

 		}

 	}

@@ -911,15 +911,15 @@

 			// Chance to trigger Taekwon kicks [Dralnu]

 			if(sc && !sc->data[SC_COMBO]) {

 				if(sc->data[SC_READYSTORM] &&

-					sc_start(src,SC_COMBO, 15, TK_STORMKICK,

+					sc_start(src,src,SC_COMBO, 15, TK_STORMKICK,

 						(2000 - 4*sstatus->agi - 2*sstatus->dex)))

 					; //Stance triggered

 				else if(sc->data[SC_READYDOWN] &&

-					sc_start(src,SC_COMBO, 15, TK_DOWNKICK,

+					sc_start(src,src,SC_COMBO, 15, TK_DOWNKICK,

 						(2000 - 4*sstatus->agi - 2*sstatus->dex)))

 					; //Stance triggered

 				else if(sc->data[SC_READYTURN] &&

-					sc_start(src,SC_COMBO, 15, TK_TURNKICK,

+					sc_start(src,src,SC_COMBO, 15, TK_TURNKICK,

 						(2000 - 4*sstatus->agi - 2*sstatus->dex)))

 					; //Stance triggered

 				else if (sc->data[SC_READYCOUNTER]) { //additional chance from SG_FRIEND [Komurka]

@@ -928,7 +928,7 @@

 						rate += rate*sc->data[SC_SKILLRATE_UP]->val2/100;

 						status_change_end(src, SC_SKILLRATE_UP, INVALID_TIMER);

 					}

-					sc_start2(src, SC_COMBO, rate, TK_COUNTER, bl->id,

+					sc_start2(src,src, SC_COMBO, rate, TK_COUNTER, bl->id,

 						(2000 - 4*sstatus->agi - 2*sstatus->dex));

 				}

 			}

@@ -940,11 +940,11 @@

 			struct status_change_entry *sce;

 			// Enchant Poison gives a chance to poison attacked enemies

 			if((sce=sc->data[SC_ENCPOISON])) //Don't use sc_start since chance comes in 1/10000 rate.

-				status_change_start(bl,SC_POISON,sce->val2, sce->val1,src->id,0,0,

+				status_change_start(src, bl,SC_POISON,sce->val2, sce->val1,src->id,0,0,

 					skill_get_time2(AS_ENCHANTPOISON,sce->val1),0);

 			// Enchant Deadly Poison gives a chance to deadly poison attacked enemies

 			if((sce=sc->data[SC_EDP]))

-				sc_start4(bl,SC_DPOISON,sce->val2, sce->val1,src->id,0,0,

+				sc_start4(src, bl,SC_DPOISON,sce->val2, sce->val1,src->id,0,0,

 					skill_get_time2(ASC_EDP,sce->val1));

 		}

 	}

@@ -953,13 +953,13 @@

 	case SM_BASH:

 		if( sd && skill_lv > 5 && pc_checkskill(sd,SM_FATALBLOW)>0 ){

 			//TODO: How much % per base level it actually is?

-			sc_start(bl,SC_STUN,(5*(skill_lv-5)+(int)sd->status.base_level/10),

+			sc_start(src,bl,SC_STUN,(5*(skill_lv-5)+(int)sd->status.base_level/10),

 				skill_lv,skill_get_time2(SM_FATALBLOW,skill_lv));

 		}

 		break;

 	case MER_CRASH:

-		sc_start(bl,SC_STUN,(6*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,(6*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case AS_VENOMKNIFE:

@@ -967,14 +967,14 @@

 			skill_lv = pc_checkskill(sd, TF_POISON);

 	case TF_POISON:

 	case AS_SPLASHER:

-		if(!sc_start2(bl,SC_POISON,(4*skill_lv+10),skill_lv,src->id,skill_get_time2(skill_id,skill_lv))

+		if(!sc_start2(src,bl,SC_POISON,(4*skill_lv+10),skill_lv,src->id,skill_get_time2(skill_id,skill_lv))

 			&&	sd && skill_id==TF_POISON

 		)

 			clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);

 		break;

 	case AS_SONICBLOW:

-		sc_start(bl,SC_STUN,(2*skill_lv+10),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,(2*skill_lv+10),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case WZ_FIREPILLAR:

@@ -985,12 +985,12 @@

 #ifndef RENEWAL

 	case WZ_FROSTNOVA:

 #endif

-		sc_start(bl,SC_FREEZE,skill_lv*3+35,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_FREEZE,skill_lv*3+35,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 #ifdef RENEWAL

 	case WZ_FROSTNOVA:

-		sc_start(bl,SC_FREEZE,skill_lv*5+33,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_FREEZE,skill_lv*5+33,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 #endif

@@ -999,11 +999,11 @@

 	 * Storm Gust counter was dropped in renewal

 	 **/

 	#ifdef RENEWAL

-		sc_start(bl,SC_FREEZE,65-(5*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_FREEZE,65-(5*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

 	#else

 		 //Tharis pointed out that this is normal freeze chance with a base of 300%

 		if(tsc->sg_counter >= 3 &&

-			sc_start(bl,SC_FREEZE,300,skill_lv,skill_get_time2(skill_id,skill_lv)))

+			sc_start(src,bl,SC_FREEZE,300,skill_lv,skill_get_time2(skill_id,skill_lv)))

 			tsc->sg_counter = 0;

 		/**

 		 * being it only resets on success it'd keep stacking and eventually overflowing on mvps, so we reset at a high value

@@ -1014,25 +1014,25 @@

 		break;

 	case WZ_METEOR:

-		sc_start(bl,SC_STUN,3*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,3*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case WZ_VERMILION:

-		sc_start(bl,SC_BLIND,4*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_BLIND,4*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case HT_FREEZINGTRAP:

 	case MA_FREEZINGTRAP:

-		sc_start(bl,SC_FREEZE,(3*skill_lv+35),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_FREEZE,(3*skill_lv+35),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case HT_FLASHER:

-		sc_start(bl,SC_BLIND,(10*skill_lv+30),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_BLIND,(10*skill_lv+30),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case HT_LANDMINE:

 	case MA_LANDMINE:

-		sc_start(bl,SC_STUN,(5*skill_lv+30),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,(5*skill_lv+30),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case HT_SHOCKWAVE:

@@ -1041,43 +1041,43 @@

 	case HT_SANDMAN:

 	case MA_SANDMAN:

-		sc_start(bl,SC_SLEEP,(10*skill_lv+40),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_SLEEP,(10*skill_lv+40),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case TF_SPRINKLESAND:

-		sc_start(bl,SC_BLIND,20,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_BLIND,20,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case TF_THROWSTONE:

-		sc_start(bl,SC_STUN,3,skill_lv,skill_get_time(skill_id,skill_lv));

-		sc_start(bl,SC_BLIND,3,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,3,skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_BLIND,3,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case NPC_DARKCROSS:

 	case CR_HOLYCROSS:

-		sc_start(bl,SC_BLIND,3*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_BLIND,3*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case CR_GRANDCROSS:

 	case NPC_GRANDDARKNESS:

 		//Chance to cause blind status vs demon and undead element, but not against players

 		if(!dstsd && (battle_check_undead(tstatus->race,tstatus->def_ele) || tstatus->race == RC_DEMON))

-			sc_start(bl,SC_BLIND,100,skill_lv,skill_get_time2(skill_id,skill_lv));

+			sc_start(src,bl,SC_BLIND,100,skill_lv,skill_get_time2(skill_id,skill_lv));

 		attack_type |= BF_WEAPON;

 		break;

 	case AM_ACIDTERROR:

-		sc_start2(bl,SC_BLEEDING,(skill_lv*3),skill_lv,src->id,skill_get_time2(skill_id,skill_lv));

-		if (skill_break_equip(bl, EQP_ARMOR, 100*skill_get_time(skill_id,skill_lv), BCT_ENEMY))

+		sc_start2(src,bl,SC_BLEEDING,(skill_lv*3),skill_lv,src->id,skill_get_time2(skill_id,skill_lv));

+		if (skill_break_equip(src,bl, EQP_ARMOR, 100*skill_get_time(skill_id,skill_lv), BCT_ENEMY))

 			clif_emotion(bl,E_OMG);

 		break;

 	case AM_DEMONSTRATION:

-		skill_break_equip(bl, EQP_WEAPON, 100*skill_lv, BCT_ENEMY);

+		skill_break_equip(src,bl, EQP_WEAPON, 100*skill_lv, BCT_ENEMY);

 		break;

 	case CR_SHIELDCHARGE:

-		sc_start(bl,SC_STUN,(15+skill_lv*5),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,(15+skill_lv*5),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case PA_PRESSURE:

@@ -1085,28 +1085,28 @@

 		break;

 	case RG_RAID:

-		sc_start(bl,SC_STUN,(10+3*skill_lv),skill_lv,skill_get_time(skill_id,skill_lv));

-		sc_start(bl,SC_BLIND,(10+3*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,(10+3*skill_lv),skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_BLIND,(10+3*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

 #ifdef RENEWAL

-		sc_start(bl,SC_RAID,100,7,5000);

+		sc_start(src,bl,SC_RAID,100,7,5000);

 		break;

 	case RG_BACKSTAP:

-		sc_start(bl,SC_STUN,(5+2*skill_lv),skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,(5+2*skill_lv),skill_lv,skill_get_time(skill_id,skill_lv));

 #endif

 		break;

 	case BA_FROSTJOKER:

-		sc_start(bl,SC_FREEZE,(15+5*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_FREEZE,(15+5*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case DC_SCREAM:

-		sc_start(bl,SC_STUN,(25+5*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,(25+5*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case BD_LULLABY:

-		sc_start(bl,SC_SLEEP,15,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_SLEEP,15,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case DC_UGLYDANCE:

@@ -1117,11 +1117,11 @@

   		break;

 	case SL_STUN:

 		if (tstatus->size==SZ_MEDIUM) //Only stuns mid-sized mobs.

-			sc_start(bl,SC_STUN,(30+10*skill_lv),skill_lv,skill_get_time(skill_id,skill_lv));

+			sc_start(src,bl,SC_STUN,(30+10*skill_lv),skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case NPC_PETRIFYATTACK:

-		sc_start4(bl,status_skill2sc(skill_id),50+10*skill_lv,

+		sc_start4(src,bl,status_skill2sc(skill_id),50+10*skill_lv,

 			skill_lv,0,0,skill_get_time(skill_id,skill_lv),

 			skill_get_time2(skill_id,skill_lv));

 		break;

@@ -1132,14 +1132,14 @@

 	case NPC_SILENCEATTACK:

 	case NPC_STUNATTACK:

 	case NPC_HELLPOWER:

-		sc_start(bl,status_skill2sc(skill_id),50+10*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,status_skill2sc(skill_id),50+10*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case NPC_ACIDBREATH:

 	case NPC_ICEBREATH:

-		sc_start(bl,status_skill2sc(skill_id),70,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,status_skill2sc(skill_id),70,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case NPC_BLEEDING:

-		sc_start2(bl,SC_BLEEDING,(20*skill_lv),skill_lv,src->id,skill_get_time2(skill_id,skill_lv));

+		sc_start2(src,bl,SC_BLEEDING,(20*skill_lv),skill_lv,src->id,skill_get_time2(skill_id,skill_lv));

 		break;

 	case NPC_MENTALBREAKER:

 	{	//Based on observations by Tharis, Mental Breaker should do SP damage

@@ -1153,45 +1153,45 @@

 	}

 	// Equipment breaking monster skills [Celest]

 	case NPC_WEAPONBRAKER:

-		skill_break_equip(bl, EQP_WEAPON, 150*skill_lv, BCT_ENEMY);

+		skill_break_equip(src,bl, EQP_WEAPON, 150*skill_lv, BCT_ENEMY);

 		break;

 	case NPC_ARMORBRAKE:

-		skill_break_equip(bl, EQP_ARMOR, 150*skill_lv, BCT_ENEMY);

+		skill_break_equip(src,bl, EQP_ARMOR, 150*skill_lv, BCT_ENEMY);

 		break;

 	case NPC_HELMBRAKE:

-		skill_break_equip(bl, EQP_HELM, 150*skill_lv, BCT_ENEMY);

+		skill_break_equip(src,bl, EQP_HELM, 150*skill_lv, BCT_ENEMY);

 		break;

 	case NPC_SHIELDBRAKE:

-		skill_break_equip(bl, EQP_SHIELD, 150*skill_lv, BCT_ENEMY);

+		skill_break_equip(src,bl, EQP_SHIELD, 150*skill_lv, BCT_ENEMY);

 		break;

 	case CH_TIGERFIST:

-		sc_start(bl,SC_STOP,(10+skill_lv*10),0,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STOP,(10+skill_lv*10),0,skill_get_time2(skill_id,skill_lv));

 		break;

 	case LK_SPIRALPIERCE:

 	case ML_SPIRALPIERCE:

-		sc_start(bl,SC_STOP,(15+skill_lv*5),0,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STOP,(15+skill_lv*5),0,skill_get_time2(skill_id,skill_lv));

 		break;

 	case ST_REJECTSWORD:

-		sc_start(bl,SC_AUTOCOUNTER,(skill_lv*15),skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_AUTOCOUNTER,(skill_lv*15),skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case PF_FOGWALL:

 		if (src != bl && !tsc->data[SC_DELUGE])

-			sc_start(bl,SC_BLIND,100,skill_lv,skill_get_time2(skill_id,skill_lv));

+			sc_start(src,bl,SC_BLIND,100,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case LK_HEADCRUSH: //Headcrush has chance of causing Bleeding status, except on demon and undead element

 		if (!(battle_check_undead(tstatus->race, tstatus->def_ele) || tstatus->race == RC_DEMON))

-			sc_start2(bl, SC_BLEEDING,50, skill_lv, src->id, skill_get_time2(skill_id,skill_lv));

+			sc_start2(src,bl, SC_BLEEDING,50, skill_lv, src->id, skill_get_time2(skill_id,skill_lv));

 		break;

 	case LK_JOINTBEAT:

 		status = status_skill2sc(skill_id);

 		if (tsc->jb_flag) {

-			sc_start4(bl,status,(5*skill_lv+5),skill_lv,tsc->jb_flag&BREAK_FLAGS,src->id,0,skill_get_time2(skill_id,skill_lv));

+			sc_start4(src,bl,status,(5*skill_lv+5),skill_lv,tsc->jb_flag&BREAK_FLAGS,src->id,0,skill_get_time2(skill_id,skill_lv));

 			tsc->jb_flag = 0;

 		}

 		break;

@@ -1199,30 +1199,30 @@

 		//Any enemies hit by this skill will receive Stun, Darkness, or external bleeding status ailment with a 5%+5*skill_lv% chance.

 		switch(rnd()%3) {

 			case 0:

-				sc_start(bl,SC_BLIND,(5+skill_lv*5),skill_lv,skill_get_time2(skill_id,1));

+				sc_start(src,bl,SC_BLIND,(5+skill_lv*5),skill_lv,skill_get_time2(skill_id,1));

 				break;

 			case 1:

-				sc_start(bl,SC_STUN,(5+skill_lv*5),skill_lv,skill_get_time2(skill_id,2));

+				sc_start(src,bl,SC_STUN,(5+skill_lv*5),skill_lv,skill_get_time2(skill_id,2));

 				break;

 			default:

-				sc_start2(bl,SC_BLEEDING,(5+skill_lv*5),skill_lv,src->id,skill_get_time2(skill_id,3));

+				sc_start2(src,bl,SC_BLEEDING,(5+skill_lv*5),skill_lv,src->id,skill_get_time2(skill_id,3));

   		}

 		break;

 	case HW_NAPALMVULCAN:

-		sc_start(bl,SC_CURSE,5*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_CURSE,5*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case WS_CARTTERMINATION:	// Cart termination

-		sc_start(bl,SC_STUN,5*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,5*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case CR_ACIDDEMONSTRATION:

-		skill_break_equip(bl, EQP_WEAPON|EQP_ARMOR, 100*skill_lv, BCT_ENEMY);

+		skill_break_equip(src,bl, EQP_WEAPON|EQP_ARMOR, 100*skill_lv, BCT_ENEMY);

 		break;

 	case TK_DOWNKICK:

-		sc_start(bl,SC_STUN,100,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN,100,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case TK_JUMPKICK:

@@ -1239,52 +1239,52 @@

 	case TK_TURNKICK:

 	case MO_BALKYOUNG: //Note: attack_type is passed as BF_WEAPON for the actual target, BF_MISC for the splash-affected mobs.

 		if(attack_type&BF_MISC) //70% base stun chance...

-			sc_start(bl,SC_STUN,70,skill_lv,skill_get_time2(skill_id,skill_lv));

+			sc_start(src,bl,SC_STUN,70,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case GS_BULLSEYE: //0.1% coma rate.

 		if(tstatus->race == RC_BRUTE || tstatus->race == RC_DEMIHUMAN)

-			status_change_start(bl,SC_COMA,10,skill_lv,0,src->id,0,0,0);

+			status_change_start(src, bl,SC_COMA,10,skill_lv,0,src->id,0,0,0);

 		break;

 	case GS_PIERCINGSHOT:

-		sc_start2(bl,SC_BLEEDING,(skill_lv*3),skill_lv,src->id,skill_get_time2(skill_id,skill_lv));

+		sc_start2(src,bl,SC_BLEEDING,(skill_lv*3),skill_lv,src->id,skill_get_time2(skill_id,skill_lv));

 		break;

 	case NJ_HYOUSYOURAKU:

-		sc_start(bl,SC_FREEZE,(10+10*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_FREEZE,(10+10*skill_lv),skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case GS_FLING:

-		sc_start(bl,SC_FLING,100, sd?sd->spiritball_old:5,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_FLING,100, sd?sd->spiritball_old:5,skill_get_time(skill_id,skill_lv));

 		break;

 	case GS_DISARM:

 		rate = 3*skill_lv;

 		if (sstatus->dex > tstatus->dex)

 			rate += (sstatus->dex - tstatus->dex)/5; //TODO: Made up formula

-		skill_strip_equip(bl, EQP_WEAPON, rate, skill_lv, skill_get_time(skill_id,skill_lv));

+		skill_strip_equip(src,bl, EQP_WEAPON, rate, skill_lv, skill_get_time(skill_id,skill_lv));

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,1);

 		break;

 	case NPC_EVILLAND:

-		sc_start(bl,SC_BLIND,5*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_BLIND,5*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case NPC_HELLJUDGEMENT:

-		sc_start(bl,SC_CURSE,100,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_CURSE,100,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case NPC_CRITICALWOUND:

-		sc_start(bl,SC_CRITICALWOUND,100,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl,SC_CRITICALWOUND,100,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case RK_WINDCUTTER:

-		sc_start(bl,SC_FEAR,3+2*skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_FEAR,3+2*skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case RK_DRAGONBREATH:

-		sc_start4(bl,SC_BURNING,5+5*skill_lv,skill_lv,1000,src->id,0,skill_get_time(skill_id,skill_lv));

+		sc_start4(src,bl,SC_BURNING,5+5*skill_lv,skill_lv,1000,src->id,0,skill_get_time(skill_id,skill_lv));

 		break;

 	case AB_ADORAMUS:

 		if( tsc && !tsc->data[SC_DECREASEAGI] ) //Prevent duplicate agi-down effect.

-			sc_start(bl, SC_ADORAMUS, skill_lv * 4 + (sd ? sd->status.job_level : 50) / 2, skill_lv, skill_get_time(skill_id, skill_lv));

+			sc_start(src,bl, SC_ADORAMUS, skill_lv * 4 + (sd ? sd->status.job_level : 50) / 2, skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case WL_CRIMSONROCK:

-		sc_start(bl, SC_STUN, 40, skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_STUN, 40, skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case WL_COMET:

-		sc_start4(bl,SC_BURNING,100,skill_lv,1000,src->id,0,skill_get_time(skill_id,skill_lv));

+		sc_start4(src,bl,SC_BURNING,100,skill_lv,1000,src->id,0,skill_get_time(skill_id,skill_lv));

 		break;

 	case WL_EARTHSTRAIN:

 		{

@@ -1294,14 +1294,14 @@

 			//rate -= rate * tstatus->dex / 200; // Disabled until official resistance is found.

 			for( i = 0; i < skill_lv; i++ )

-				skill_strip_equip(bl,pos[i],rate,skill_lv,skill_get_time2(skill_id,skill_lv));

+				skill_strip_equip(src,bl,pos[i],rate,skill_lv,skill_get_time2(skill_id,skill_lv));

 		}

 		break;

 	case WL_JACKFROST:

-		sc_start(bl,SC_FREEZE,100,skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_FREEZE,100,skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case RA_WUGBITE:

-		sc_start(bl, SC_BITE,  (sd ? pc_checkskill(sd,RA_TOOTHOFWUG)*2 : 0), skill_lv, (skill_get_time(skill_id,skill_lv) + (sd ? pc_checkskill(sd,RA_TOOTHOFWUG)*500 : 0)) );

+		sc_start(src,bl, SC_BITE,  (sd ? pc_checkskill(sd,RA_TOOTHOFWUG)*2 : 0), skill_lv, (skill_get_time(skill_id,skill_lv) + (sd ? pc_checkskill(sd,RA_TOOTHOFWUG)*500 : 0)) );

 		break;

 	case RA_SENSITIVEKEEN:

 		if( rnd()%100 < 8 * skill_lv )

@@ -1309,7 +1309,7 @@

 		break;

 	case RA_FIRINGTRAP:

 	case RA_ICEBOUNDTRAP:

-		sc_start(bl, (skill_id == RA_FIRINGTRAP) ? SC_BURNING:SC_FREEZING, 40 + 10 * skill_lv, skill_lv, skill_get_time2(skill_id, skill_lv));

+		sc_start(src,bl, (skill_id == RA_FIRINGTRAP) ? SC_BURNING:SC_FREEZING, 40 + 10 * skill_lv, skill_lv, skill_get_time2(skill_id, skill_lv));

 		break;

 	case NC_PILEBUNKER:

 		if( rnd()%100 < 5 + 15*skill_lv )

@@ -1322,14 +1322,14 @@

 		}

 		break;

 	case NC_FLAMELAUNCHER:

-		sc_start4(bl, SC_BURNING, 50 + 10 * skill_lv, skill_lv, 1000, src->id, 0, skill_get_time2(skill_id, skill_lv));

+		sc_start4(src,bl, SC_BURNING, 50 + 10 * skill_lv, skill_lv, 1000, src->id, 0, skill_get_time2(skill_id, skill_lv));

 		break;

 	case NC_COLDSLOWER:

-		sc_start(bl, SC_FREEZE, 10 * skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

-		sc_start(bl, SC_FREEZING, 20 + 10 * skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_FREEZE, 10 * skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_FREEZING, 20 + 10 * skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case NC_POWERSWING:

-		sc_start(bl, SC_STUN, 5*skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_STUN, 5*skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

 		if( rnd()%100 < 5*skill_lv )

 			skill_castend_damage_id(src, bl, NC_AXEBOOMERANG, pc_checkskill(sd, NC_AXEBOOMERANG), tick, 1);

 		break;

@@ -1337,20 +1337,20 @@

 		skill_castend_nodamage_id(src,bl,skill_id,skill_lv,tick,BCT_ENEMY);

 		break;

 	case LG_SHIELDPRESS:

-		sc_start(bl, SC_STUN, 30 + 8 * skill_lv, skill_lv, skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl, SC_STUN, 30 + 8 * skill_lv, skill_lv, skill_get_time(skill_id,skill_lv));

 		break;

 	case LG_PINPOINTATTACK:

 		rate = 30 + (((5 * (sd?pc_checkskill(sd,LG_PINPOINTATTACK):skill_lv)) + (sstatus->agi + status_get_lv(src))) / 10);

 		switch( skill_lv ) {

 			case 1:

-				sc_start2(bl,SC_BLEEDING,rate,skill_lv,src->id,skill_get_time(skill_id,skill_lv));

+				sc_start2(src,bl,SC_BLEEDING,rate,skill_lv,src->id,skill_get_time(skill_id,skill_lv));

 				break;

 			case 2:

 				if( dstsd && dstsd->spiritball && rnd()%100 < rate )

 					pc_delspiritball(dstsd, dstsd->spiritball, 0);

 				break;

 			default:

-				skill_break_equip(bl,(skill_lv == 3) ? EQP_SHIELD : (skill_lv == 4) ? EQP_ARMOR : EQP_WEAPON,rate * 100,BCT_ENEMY);

+				skill_break_equip(src,bl,(skill_lv == 3) ? EQP_SHIELD : (skill_lv == 4) ? EQP_ARMOR : EQP_WEAPON,rate * 100,BCT_ENEMY);

 				break;

 		}

 		break;

@@ -1359,36 +1359,36 @@

 		if( rnd()%100 < rate && dstsd ) // Uses skill_addtimerskill to avoid damage and setsit packet overlaping. Officially clif_setsit is received about 500 ms after damage packet.

 			skill_addtimerskill(src,tick+500,bl->id,0,0,skill_id,skill_lv,BF_WEAPON,0);

 		else if( dstmd && !is_boss(bl) )

-			sc_start(bl,SC_STOP,100,skill_lv,skill_get_time(skill_id,skill_lv));

+			sc_start(src,bl,SC_STOP,100,skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case LG_RAYOFGENESIS:	// 50% chance to cause Blind on Undead and Demon monsters.

 		if ( battle_check_undead(tstatus->race, tstatus->def_ele) || tstatus->race == RC_DEMON )

-			sc_start(bl, SC_BLIND,50, skill_lv, skill_get_time(skill_id,skill_lv));

+			sc_start(src,bl, SC_BLIND,50, skill_lv, skill_get_time(skill_id,skill_lv));

 		break;

 	case LG_EARTHDRIVE:

-		skill_break_equip(src, EQP_SHIELD, 500, BCT_SELF);

-		sc_start(bl, SC_EARTHDRIVE, 100, skill_lv, skill_get_time(skill_id, skill_lv));

+		skill_break_equip(src,src, EQP_SHIELD, 500, BCT_SELF);

+		sc_start(src,bl, SC_EARTHDRIVE, 100, skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case SR_DRAGONCOMBO:

-		sc_start(bl, SC_STUN, 1 + skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_STUN, 1 + skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case SR_FALLENEMPIRE:

-		sc_start(bl, SC_STOP, 100, skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_STOP, 100, skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case SR_WINDMILL:

 		if( dstsd )

 			skill_addtimerskill(src,tick+status_get_amotion(src),bl->id,0,0,skill_id,skill_lv,BF_WEAPON,0);

 		else if( dstmd && !is_boss(bl) )

-			sc_start(bl, SC_STUN, 100, skill_lv, 1000 + 1000 * (rnd() %3));

+			sc_start(src,bl, SC_STUN, 100, skill_lv, 1000 + 1000 * (rnd() %3));

 		break;

 	case SR_GENTLETOUCH_QUIET:  //  [(Skill Level x 5) + (Caster?s DEX + Caster?s Base Level) / 10]

-		sc_start(bl, SC_SILENCE, 5 * skill_lv + (sstatus->dex + status_get_lv(src)) / 10, skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_SILENCE, 5 * skill_lv + (sstatus->dex + status_get_lv(src)) / 10, skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case SR_EARTHSHAKER:

-		sc_start(bl,SC_STUN, 25 + 5 * skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_STUN, 25 + 5 * skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case SR_HOWLINGOFLION:

-		sc_start(bl, SC_FEAR, 5 + 5 * skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_FEAR, 5 + 5 * skill_lv, skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case WM_SOUND_OF_DESTRUCTION:

 		if( rnd()%100 < 5 + 5 * skill_lv ) { // Temporarly Check Until We Get the Official Formula

@@ -1423,73 +1423,73 @@

 		}

 		break;

 	case SO_EARTHGRAVE:

-		sc_start2(bl, SC_BLEEDING, 5 * skill_lv, skill_lv, src->id, skill_get_time2(skill_id, skill_lv));	// Need official rate. [LimitLine]

+		sc_start2(src,bl, SC_BLEEDING, 5 * skill_lv, skill_lv, src->id, skill_get_time2(skill_id, skill_lv));	// Need official rate. [LimitLine]

 		break;

 	case SO_DIAMONDDUST:

 		rate = 5 + 5 * skill_lv;

 		if( sc && sc->data[SC_COOLER_OPTION] )

 			rate += rate * sc->data[SC_COOLER_OPTION]->val2 / 100;

-		sc_start(bl, SC_CRYSTALIZE, rate, skill_lv, skill_get_time2(skill_id, skill_lv));

+		sc_start(src,bl, SC_CRYSTALIZE, rate, skill_lv, skill_get_time2(skill_id, skill_lv));

 		break;

 	case SO_VARETYR_SPEAR:

-		sc_start(bl, SC_STUN, 5 + 5 * skill_lv, skill_lv, skill_get_time2(skill_id, skill_lv));

+		sc_start(src,bl, SC_STUN, 5 + 5 * skill_lv, skill_lv, skill_get_time2(skill_id, skill_lv));

 		break;

 	case GN_SLINGITEM_RANGEMELEEATK:

 		if( sd ) {

 			switch( sd->itemid ) {	// Starting SCs here instead of do it in skill_additional_effect to simplify the code.

 				case 13261:

-					sc_start(bl, SC_STUN, 100, skill_lv, skill_get_time2(GN_SLINGITEM, skill_lv));

-					sc_start2(bl, SC_BLEEDING, 100, skill_lv, src->id, skill_get_time2(GN_SLINGITEM, skill_lv));

+					sc_start(src,bl, SC_STUN, 100, skill_lv, skill_get_time2(GN_SLINGITEM, skill_lv));

+					sc_start2(src,bl, SC_BLEEDING, 100, skill_lv, src->id, skill_get_time2(GN_SLINGITEM, skill_lv));

 					break;

 				case 13262:

-					sc_start(bl, SC_MELON_BOMB, 100, skill_lv, skill_get_time(GN_SLINGITEM, skill_lv));	// Reduces ASPD and moviment speed

+					sc_start(src,bl, SC_MELON_BOMB, 100, skill_lv, skill_get_time(GN_SLINGITEM, skill_lv));	// Reduces ASPD and moviment speed

 					break;

 				case 13264:

-					sc_start(bl, SC_BANANA_BOMB, 100, skill_lv, skill_get_time(GN_SLINGITEM, skill_lv));	// Reduces LUK ??Needed confirm it, may be it's bugged in kRORE?

-					sc_start(bl, SC_BANANA_BOMB_SITDOWN, 75, skill_lv, skill_get_time(GN_SLINGITEM_RANGEMELEEATK,skill_lv)); // Sitdown for 3 seconds.

+					sc_start(src,bl, SC_BANANA_BOMB, 100, skill_lv, skill_get_time(GN_SLINGITEM, skill_lv));	// Reduces LUK ??Needed confirm it, may be it's bugged in kRORE?

+					sc_start(src,bl, SC_BANANA_BOMB_SITDOWN, 75, skill_lv, skill_get_time(GN_SLINGITEM_RANGEMELEEATK,skill_lv)); // Sitdown for 3 seconds.

 					break;

 			}

 			sd->itemid = -1;

 		}

 		break;

 	case GN_HELLS_PLANT_ATK:

-		sc_start(bl, SC_STUN,  5 + 5 * skill_lv, skill_lv, skill_get_time2(skill_id, skill_lv));

-		sc_start2(bl, SC_BLEEDING, 20 + 10 * skill_lv, skill_lv, src->id,skill_get_time2(skill_id, skill_lv));

+		sc_start(src,bl, SC_STUN,  5 + 5 * skill_lv, skill_lv, skill_get_time2(skill_id, skill_lv));

+		sc_start2(src,bl, SC_BLEEDING, 20 + 10 * skill_lv, skill_lv, src->id,skill_get_time2(skill_id, skill_lv));

 		break;

 	case EL_WIND_SLASH:	// Non confirmed rate.

-		sc_start2(bl, SC_BLEEDING, 25, skill_lv, src->id, skill_get_time(skill_id,skill_lv));

+		sc_start2(src,bl, SC_BLEEDING, 25, skill_lv, src->id, skill_get_time(skill_id,skill_lv));

 		break;

 	case EL_STONE_HAMMER:

 		rate = 10 * skill_lv;

-		sc_start(bl, SC_STUN, rate, skill_lv, skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl, SC_STUN, rate, skill_lv, skill_get_time(skill_id,skill_lv));

 		break;

 	case EL_ROCK_CRUSHER:

 	case EL_ROCK_CRUSHER_ATK:

-		sc_start(bl,status_skill2sc(skill_id),50,skill_lv,skill_get_time(EL_ROCK_CRUSHER,skill_lv));

+		sc_start(src,bl,status_skill2sc(skill_id),50,skill_lv,skill_get_time(EL_ROCK_CRUSHER,skill_lv));

 		break;

 	case EL_TYPOON_MIS:

-		sc_start(bl,SC_SILENCE,10*skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_SILENCE,10*skill_lv,skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case KO_JYUMONJIKIRI: // needs more info

-		sc_start(bl,SC_JYUMONJIKIRI,25,skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_JYUMONJIKIRI,25,skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case KO_MAKIBISHI:

-		sc_start(bl, SC_STUN, 100, skill_lv, skill_get_time2(skill_id,skill_lv));

+		sc_start(src,bl, SC_STUN, 100, skill_lv, skill_get_time2(skill_id,skill_lv));

 		break;

 	case MH_LAVA_SLIDE:

-		if (tsc && !tsc->data[SC_BURNING]) sc_start4(bl, SC_BURNING, 10 * skill_lv, skill_lv, 1000, src->id, 0, skill_get_time(skill_id, skill_lv));

+		if (tsc && !tsc->data[SC_BURNING]) sc_start4(src,bl, SC_BURNING, 10 * skill_lv, skill_lv, 1000, src->id, 0, skill_get_time(skill_id, skill_lv));

 		break;

 	case MH_STAHL_HORN:

-		sc_start(bl, SC_STUN, (20 + 4 * (skill_lv-1)), skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_STUN, (20 + 4 * (skill_lv-1)), skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case MH_NEEDLE_OF_PARALYZE:

-		sc_start(bl, SC_PARALYSIS, 40 + (5*skill_lv), skill_lv, skill_get_time(skill_id, skill_lv));

+		sc_start(src,bl, SC_PARALYSIS, 40 + (5*skill_lv), skill_lv, skill_get_time(skill_id, skill_lv));

 		break;

 	case MH_SILVERVEIN_RUSH:

-		sc_start4(bl,SC_STUN,20 + (5*skill_lv),skill_lv,src->id,0,0,skill_get_time(skill_id,skill_lv));

+		sc_start4(src,bl,SC_STUN,20 + (5*skill_lv),skill_lv,src->id,0,0,skill_get_time(skill_id,skill_lv));

 		break;

 	case MH_MIDNIGHT_FRENZY:

-		sc_start4(bl,SC_FEAR,20 + (4*skill_lv),skill_lv,src->id,0,0,skill_get_time(skill_id,skill_lv));

+		sc_start4(src,bl,SC_FEAR,20 + (4*skill_lv),skill_lv,src->id,0,0,skill_get_time(skill_id,skill_lv));

 		break;

 	}

@@ -1507,7 +1507,7 @@

 			rate += sd->weapon_coma_race[tstatus->race];

 			rate += sd->weapon_coma_race[tstatus->mode&MD_BOSS?RC_BOSS:RC_NONBOSS];

 			if (rate)

-				status_change_start(bl, SC_COMA, rate, 0, 0, src->id, 0, 0, 0);

+				status_change_start(src,bl, SC_COMA, rate, 0, 0, src->id, 0, 0, 0);

 		}

 		if( sd && battle_config.equip_self_break_rate )

 		{	// Self weapon breaking

@@ -1522,7 +1522,7 @@

 					rate += 10;

 			}

 			if( rate )

-				skill_break_equip(src, EQP_WEAPON, rate, BCT_SELF);

+				skill_break_equip(src,src, EQP_WEAPON, rate, BCT_SELF);

 		}

 		if( battle_config.equip_skill_break_rate && skill_id != WS_CARTTERMINATION && skill_id != ITM_TOMAHAWK )

 		{	// Cart Termination/Tomahawk won't trigger breaking data. Why? No idea, go ask Gravity.

@@ -1533,7 +1533,7 @@

 			if( sc && sc->data[SC_MELTDOWN] )

 				rate += sc->data[SC_MELTDOWN]->val2;

 			if( rate )

-				skill_break_equip(bl, EQP_WEAPON, rate, BCT_ENEMY);

+				skill_break_equip(src,bl, EQP_WEAPON, rate, BCT_ENEMY);

 			// Target armor breaking

 			rate = 0;

@@ -1542,7 +1542,7 @@

 			if( sc && sc->data[SC_MELTDOWN] )

 				rate += sc->data[SC_MELTDOWN]->val3;

 			if( rate )

-				skill_break_equip(bl, EQP_ARMOR, rate, BCT_ENEMY);

+				skill_break_equip(src,bl, EQP_ARMOR, rate, BCT_ENEMY);

 		}

 	}

@@ -1851,19 +1851,19 @@

 			time = skill_get_time2(status_sc2skill(type),7);

 			if (dstsd->addeff2[i].flag&ATF_TARGET)

-				status_change_start(src,type,rate,7,0,0,0,time,0);

+				status_change_start(src, src,type,rate,7,0,0,0,time,0);

 			if (dstsd->addeff2[i].flag&ATF_SELF && !status_isdead(bl))

-				status_change_start(bl,type,rate,7,0,0,0,time,0);

+				status_change_start(src, bl,type,rate,7,0,0,0,time,0);

 		}

 	}

 	switch(skill_id){

 	case MO_EXTREMITYFIST:

-		sc_start(src,SC_EXTREMITYFIST,100,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,src,SC_EXTREMITYFIST,100,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case GS_FULLBUSTER:

-		sc_start(src,SC_BLIND,2*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

+		sc_start(src,src,SC_BLIND,2*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));

 		break;

 	case HFLI_SBR44:	//[orn]

 	case HVAN_EXPLOSION:

@@ -1882,7 +1882,7 @@

 	if(sd && (sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR &&

 		rnd()%10000 < battle_config.sg_miracle_skill_ratio)	//SG_MIRACLE [Komurka]

-		sc_start(src,SC_MIRACLE,100,1,battle_config.sg_miracle_skill_duration);

+		sc_start(src,src,SC_MIRACLE,100,1,battle_config.sg_miracle_skill_duration);

 	if(sd && skill_id && attack_type&BF_MAGIC && status_isdead(bl) &&

 	 	!(skill_get_inf(skill_id)&(INF_GROUND_SKILL|INF_SELF_SKILL)) &&

@@ -2038,7 +2038,7 @@

  - flag is a BCT_ flag to indicate which type of adjustment should be used

    (BCT_ENEMY/BCT_PARTY/BCT_SELF) are the valid values.

 --------------------------------------------------------------------------*/

-int skill_break_equip (struct block_list *bl, unsigned short where, int rate, int flag)

+int skill_break_equip (struct block_list *src,struct block_list *bl, unsigned short where, int rate, int flag)

 {

 	const int where_list[4]     = {EQP_WEAPON, EQP_ARMOR, EQP_SHIELD, EQP_HELM};

 	const enum sc_type scatk[4] = {SC_STRIPWEAPON, SC_STRIPARMOR, SC_STRIPSHIELD, SC_STRIPHELM};

@@ -2085,7 +2085,7 @@

 			else if (rnd()%10000 >= rate)

 				where&=~where_list[i];

 			else if (!sd && !(status_get_mode(bl)&MD_BOSS)) //Cause Strip effect.

-				sc_start(bl,scatk[i],100,0,skill_get_time(status_sc2skill(scatk[i]),1));

+				sc_start(src,bl,scatk[i],100,0,skill_get_time(status_sc2skill(scatk[i]),1));

 		}

 	}

 	if (!where) //Nothing to break.

@@ -2129,7 +2129,7 @@

 	return where; //Return list of pieces broken.

 }

-int skill_strip_equip(struct block_list *bl, unsigned short where, int rate, int lv, int time)

+int skill_strip_equip(struct block_list *src, struct block_list *bl, unsigned short where, int rate, int lv, int time)

 {

 	struct status_change *sc;

 	const int pos[5]             = {EQP_WEAPON, EQP_SHIELD, EQP_ARMOR, EQP_HELM, EQP_ACC};

@@ -2151,7 +2151,7 @@

 	if (!where) return 0;

 	for (i = 0; i < ARRAYLENGTH(pos); i++) {

-		if (where&pos[i] && !sc_start(bl, sc_atk[i], 100, lv, time))

+		if (where&pos[i] && !sc_start(src,bl, sc_atk[i], 100, lv, time))

 			where&=~pos[i];

 	}

 	return where?1:0;

@@ -2461,7 +2461,7 @@

 				if( (tstatus->race == RC_BRUTE || tstatus->race == RC_INSECT) && pc_checkskill(sd, HT_POWER))

 				{

 					//TODO: This code was taken from Triple Blows, is this even how it should be? [Skotlex]

-					sc_start2(src,SC_COMBO,100,HT_POWER,bl->id,2000);

+					sc_start2(src,src,SC_COMBO,100,HT_POWER,bl->id,2000);

 					clif_combo_delay(src,2000);

 				}

 				break;

@@ -2475,7 +2475,7 @@

 			case SL_STIN:

 			case SL_STUN:

 				if (skill_lv >= 7 && !sd->sc.data[SC_SMA])

-					sc_start(src,SC_SMA,100,skill_lv,skill_get_time(SL_SMA, skill_lv));

+					sc_start(src,src,SC_SMA,100,skill_lv,skill_get_time(SL_SMA, skill_lv));

 				break;

 			case GS_FULLBUSTER:

 				//Can't attack nor use items until skill's delay expires. [Skotlex]

@@ -2493,7 +2493,7 @@

 		if (flag) { //Possible to chain

 			flag = DIFF_TICK(sd->ud.canact_tick, tick);

 			if (flag < 1) flag = 1;

-			sc_start2(src,SC_COMBO,100,skill_id,bl->id,flag);

+			sc_start2(src,src,SC_COMBO,100,skill_id,bl->id,flag);

 			clif_combo_delay(src, flag);

 		}

 	}

@@ -2706,7 +2706,7 @@

 	}

 	// Hell Inferno burning status only starts if Fire part hits.

 	if( skill_id == WL_HELLINFERNO && dmg.damage > 0 )

-		sc_start4(bl,SC_BURNING,55+5*skill_lv,skill_lv,1000,src->id,0,skill_get_time(skill_id,skill_lv));

+		sc_start4(src,bl,SC_BURNING,55+5*skill_lv,skill_lv,1000,src->id,0,skill_get_time(skill_id,skill_lv));

 	// Apply knock back chance in SC_TRIANGLESHOT skill.

 	else if( skill_id == SC_TRIANGLESHOT && rnd()%100 > (1 + skill_lv) )

 		dmg.blewcount = 0;

@@ -2845,12 +2845,12 @@

 		 **/

 		switch( skill_id ) {

 			case RK_CRUSHSTRIKE:

-				skill_break_equip(src,EQP_WEAPON,2000,BCT_SELF); // 20% chance to destroy the weapon.

+				skill_break_equip(src,src,EQP_WEAPON,2000,BCT_SELF); // 20% chance to destroy the weapon.

 				break;

 			case GC_VENOMPRESSURE: {

 					struct status_change *ssc = status_get_sc(src);

 					if( ssc && ssc->data[SC_POISONINGWEAPON] && rnd()%100 < 70 + 5*skill_lv ) {

-						sc_start(bl,ssc->data[SC_POISONINGWEAPON]->val2,100,ssc->data[SC_POISONINGWEAPON]->val1,skill_get_time2(GC_POISONINGWEAPON, 1));

+						sc_start(src,bl,ssc->data[SC_POISONINGWEAPON]->val2,100,ssc->data[SC_POISONINGWEAPON]->val1,skill_get_time2(GC_POISONINGWEAPON, 1));

 						status_change_end(src,SC_POISONINGWEAPON,INVALID_TIMER);

 						clif_skill_nodamage(src,bl,skill_id,skill_lv,1);

 					}

@@ -3064,7 +3064,7 @@

 		}

 		return 0;

 	}

-	sc_start4(&sd->bl, SC_GUILDAURA,100, 1, id, strvit, agidex, 1000);

+	sc_start4(NULL,&sd->bl, SC_GUILDAURA,100, 1, id, strvit, agidex, 1000);

 	return 1;

 }

@@ -3319,7 +3319,7 @@

 							if( j )

 							{

 								i = applyeffects[rnd()%j];

-								status_change_start(target, i, 10000, skl->skill_lv,

+								status_change_start(src, target, i, 10000, skl->skill_lv,

 									(i == SC_BURNING ? 1000 : (i == SC_BLEEDING ? src->id : 0)),

 									(i == SC_BURNING ? src->id : 0),

 									0, skill_get_time(WL_TETRAVORTEX,skl->skill_lv), 0);

@@ -3803,7 +3803,7 @@

 				status_change_end(src, SC_EXPLOSIONSPIRITS, INVALID_TIMER);

 				status_change_end(src, SC_BLADESTOP, INVALID_TIMER);

 #ifdef RENEWAL

-				sc_start(src,SC_EXTREMITYFIST2,100,skill_lv,skill_get_time(skill_id,skill_lv));

+				sc_start(src,src,SC_EXTREMITYFIST2,100,skill_lv,skill_get_time(skill_id,skill_lv));

 #endif

 			}else

 				status_set_hp(src,

@@ -4047,7 +4047,7 @@

 	case NPC_MAGICALATTACK:

 		skill_attack(BF_MAGIC,src,src,bl,skill_id,skill_lv,tick,flag);

-		sc_start(src,status_skill2sc(skill_id),100,skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,src,status_skill2sc(skill_id),100,skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case HVAN_CAPRICE: //[blackhole89]

@@ -4112,7 +4112,7 @@

 	case SL_STIN:

 	case SL_STUN:

 		if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {

-			status_change_start(src,SC_STUN,10000,skill_lv,0,0,0,500,10);

+			status_change_start(src, src,SC_STUN,10000,skill_lv,0,0,0,500,10);

 			clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);

 			break;

 		}

@@ -4187,7 +4187,7 @@

 	case NJ_KASUMIKIRI:

 		if (skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag) > 0)

-			sc_start(src,SC_HIDING,100,skill_lv,skill_get_time(skill_id,skill_lv));

+			sc_start(src,src,SC_HIDING,100,skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case NJ_KIRIKAGE:

 		if( !map_flag_gvg(src->m) && !map[src->m].flag.battleground )

@@ -4447,7 +4447,7 @@

 		break;

 	case WL_FROSTMISTY:

 		// Causes Freezing status through walls.

-		sc_start(bl,status_skill2sc(skill_id),20+12*skill_lv+(sd ? sd->status.job_level : 50)/5,skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,status_skill2sc(skill_id),20+12*skill_lv+(sd ? sd->status.job_level : 50)/5,skill_lv,skill_get_time(skill_id,skill_lv));

 		// Doesn't deal damage through non-shootable walls.

 		if( path_search(NULL,src->m,src->x,src->y,bl->x,bl->y,1,CELL_CHKWALL) )

 			skill_attack(BF_MAGIC,src,src,bl,skill_id,skill_lv,tick,flag|SD_ANIMATION);

@@ -4510,7 +4510,7 @@

 		if( flag&1 )

 		{ //TODO: Need a confirmation if the other type of hidden status is included to be scanned. [Jobbie]

 			if( rnd()%100 < 50 )

-				sc_start(bl, SC_INFRAREDSCAN, 10000, skill_lv, skill_get_time(skill_id, skill_lv));

+				sc_start(src,bl, SC_INFRAREDSCAN, 10000, skill_lv, skill_get_time(skill_id, skill_lv));

 			status_change_end(bl, SC_HIDING, INVALID_TIMER);

 			status_change_end(bl, SC_CLOAKING, INVALID_TIMER);

 			status_change_end(bl, SC_CLOAKINGEXCEED, INVALID_TIMER); // Need confirm it.

@@ -4524,7 +4524,7 @@

 		break;

 	case NC_MAGNETICFIELD:

-		sc_start2(bl,SC_MAGNETICFIELD,100,skill_lv,src->id,skill_get_time(skill_id,skill_lv));

+		sc_start2(src,bl,SC_MAGNETICFIELD,100,skill_lv,src->id,skill_get_time(skill_id,skill_lv));

 		break;

 	case SC_FATALMENACE:

 		if( flag&1 )

@@ -4689,8 +4689,8 @@

 			if( rnd()%100 < 50 )

 				skill_attack(skill_get_type(skill_id),src,src,bl,skill_id,skill_lv,tick,flag);

 			else {

-				sc_start(src,type2,100,skill_lv,skill_get_time(skill_id,skill_lv));

-				sc_start(battle_get_master(src),type,100,ele->bl.id,skill_get_time(skill_id,skill_lv));

+				sc_start(src,src,type2,100,skill_lv,skill_get_time(skill_id,skill_lv));

+				sc_start(src,battle_get_master(src),type,100,ele->bl.id,skill_get_time(skill_id,skill_lv));

 			}

 			clif_skill_nodamage(src,src,skill_id,skill_lv,1);

 		}

@@ -4764,9 +4764,9 @@

 			    duration = (status_get_str(src)*2 - status_get_str(bl))/10;//custom need real formula

 			    hom_delspiritball(hd,skill_id==MH_EQC?2:1,0); //only EQC consume 2 in grp 2

 			    if(skill_id==MH_TINDER_BREAKER)

-				sc_start2(src,status_skill2sc(skill_id),100,skill_lv,bl->id,duration);

+				sc_start2(src,src,status_skill2sc(skill_id),100,skill_lv,bl->id,duration);

 			    else

-				sc_start(bl,status_skill2sc(skill_id),100,skill_lv,duration);

+				sc_start(src,bl,status_skill2sc(skill_id),100,skill_lv,duration);

 			    skill_attack(skill_get_type(skill_id),src,src,tbl,skill_id,skill_lv,tick,flag);

 			    //TODO add bonus for dmg SP ? on battle

 			    break;

@@ -5063,12 +5063,12 @@

 	case AL_DECAGI:

 	case MER_DECAGI:

 		clif_skill_nodamage (src, bl, skill_id, skill_lv,

-			sc_start(bl, type, (50 + skill_lv * 3 + (status_get_lv(src) + sstatus->int_)/5), skill_lv, skill_get_time(skill_id,skill_lv)));

+			sc_start(src,bl, type, (50 + skill_lv * 3 + (status_get_lv(src) + sstatus->int_)/5), skill_lv, skill_get_time(skill_id,skill_lv)));

 		break;

 	case AL_CRUCIS:

 		if (flag&1)

-			sc_start(bl,type, 23+skill_lv*4 +status_get_lv(src) -status_get_lv(bl), skill_lv,skill_get_time(skill_id,skill_lv));

+			sc_start(src,bl,type, 23+skill_lv*4 +status_get_lv(src) -status_get_lv(bl), skill_lv,skill_get_time(skill_id,skill_lv));

 		else {

 			map_foreachinrange(skill_area_sub, src, skill_get_splash(skill_id, skill_lv), BL_CHAR,

 				src, skill_id, skill_lv, tick, flag|BCT_ENEMY|1, skill_castend_nodamage_id);

@@ -5081,7 +5081,7 @@

 		if( tsce )

 			status_change_end(bl,type, INVALID_TIMER);

 		else

-			sc_start(bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv));

+			sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv));

 		clif_skill_nodamage (src, bl, skill_id, skill_lv, 1);

 		break;

@@ -5138,7 +5138,7 @@

 	case SA_COMA:

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,

-			sc_start(bl,type,100,skill_lv,skill_get_time2(skill_id,skill_lv)));

+			sc_start(src,bl,type,100,skill_lv,skill_get_time2(skill_id,skill_lv)));

 		break;

 	case SA_FULLRECOVERY:

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,1);

@@ -5210,7 +5210,7 @@

 		break;

 	case SA_REVERSEORCISH:

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,

-			sc_start(bl,type,100,skill_lv,skill_get_time(skill_id, skill_lv)));

+			sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id, skill_lv)));

 		break;

 	case SA_FORTUNE:

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,1);

@@ -5234,7 +5234,7 @@

 			}

 		}

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,

-			sc_start(bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

+			sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

 		break;

 	case CG_MARIONETTE:

@@ -5252,8 +5252,8 @@

 			{

 				if( !sc->data[SC_MARIONETTE] && !tsc->data[SC_MARIONETTE2] )

 				{

-					sc_start(src,SC_MARIONETTE,100,bl->id,skill_get_time(skill_id,skill_lv));

-					sc_start(bl,SC_MARIONETTE2,100,src->id,skill_get_time(skill_id,skill_lv));

+					sc_start(src,src,SC_MARIONETTE,100,bl->id,skill_get_time(skill_id,skill_lv));

+					sc_start(src,bl,SC_MARIONETTE2,100,src->id,skill_get_time(skill_id,skill_lv));

 					clif_skill_nodamage(src,bl,skill_id,skill_lv,1);

 				}

 				else

@@ -5277,7 +5277,7 @@

 	case RG_CLOSECONFINE:

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,

-			sc_start4(bl,type,100,skill_lv,src->id,0,0,skill_get_time(skill_id,skill_lv)));

+			sc_start4(src,bl,type,100,skill_lv,src->id,0,0,skill_get_time(skill_id,skill_lv)));

 		break;

 	case SA_FLAMELAUNCHER:	// added failure chance and chance to break weapon if turned on [Valaris]

 	case SA_FROSTWEAPON:

@@ -5302,10 +5302,10 @@

 			}

 		}

 		// 100% success rate at lv4 & 5, but lasts longer at lv5

-		if(!clif_skill_nodamage(src,bl,skill_id,skill_lv, sc_start(bl,type,(60+skill_lv*10),skill_lv, skill_get_time(skill_id,skill_lv)))) {

+		if(!clif_skill_nodamage(src,bl,skill_id,skill_lv, sc_start(src,bl,type,(60+skill_lv*10),skill_lv, skill_get_time(skill_id,skill_lv)))) {

 			if (sd)

 				clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);

-			if (skill_break_equip(bl, EQP_WEAPON, 10000, BCT_PARTY) && sd && sd != dstsd)

+			if (skill_break_equip(src,bl, EQP_WEAPON, 10000, BCT_PARTY) && sd && sd != dstsd)

 				clif_displaymessage(sd->fd, msg_txt(669));

 		}

 		break;

@@ -5316,12 +5316,12 @@

 			break;

 		}

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,

-			sc_start(bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

+			sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

 		break;

 	case ITEM_ENCHANTARMS:

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,

-			sc_start2(bl,type,100,skill_lv,

+			sc_start2(src,bl,type,100,skill_lv,

 				skill_get_ele(skill_id,skill_lv), skill_get_time(skill_id,skill_lv)));

 		break;

@@ -5336,16 +5336,16 @@

 			case ELE_HOLY  : type = SC_ASPERSIO;     break;

 		}

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,

-			sc_start(bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

+			sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

-		sc_start(bl,SC_SEVENWIND,100,skill_lv,skill_get_time(skill_id,skill_lv));

+		sc_start(src,bl,SC_SEVENWIND,100,skill_lv,skill_get_time(skill_id,skill_lv));

 		break;

 	case PR_KYRIE:

 	case MER_KYRIE:

 		clif_skill_nodamage(bl,bl,skill_id,skill_lv,

-			sc_start(bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

+			sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

 		break;

 	//Passive Magnum, should had been casted on yourself.

 	case SM_MAGNUM:

@@ -5355,7 +5355,7 @@

 			src,skill_id,skill_lv,tick, flag|BCT_ENEMY|1, skill_castend_damage_id);

 		clif_skill_nodamage (src,src,skill_id,skill_lv,1);

 		// Initiate 10% of your damage becomes fire element.

-		sc_start4(src,SC_WATK_ELEMENT,100,3,20,0,0,skill_get_time2(skill_id, skill_lv));

+		sc_start4(src,src,SC_WATK_ELEMENT,100,3,20,0,0,skill_get_time2(skill_id, skill_lv));

 		if( sd )

 			skill_blockpc_start(sd, skill_id, skill_get_time(skill_id, skill_lv));

 		else if( bl->type == BL_MER )

@@ -5452,7 +5452,7 @@

 	case GN_CARTBOOST:

 	case KO_MEIKYOUSISUI:

 		clif_skill_nodamage(src,bl,skill_id,skill_lv,

-			sc_start(bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

+			sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));

 		break;

 	case SO_STRIKING:

@@ -5461,7 +5461,7 @@

 			bonus += (pc_checkskill(sd, SA_FLAMELAUNCHER)+pc_checkskill(sd, SA_FROSTWEAPON)+pc_checkskill(sd, SA_LIGHTNINGLOADER)+pc_checkskill(sd, SA_SEISMICWEAPON))*5;

 			clif_skill_nodamage( src, bl, skill_id, skill_lv,

 								battle_check_target(src,bl,BCT_PARTY) ?

-								sc_start2(bl, type, 100, skill_lv, bonus, skill_get_time(skill_id,skill_lv)) :

+								sc_start2(src,bl, type, 100, skill_lv, bonus, skill_get_time(skill_id,skill_lv)) :

 								0

 				);

 		}

@@ -5469,15 +5469,15 @@

 	case NPC_STOP:

 		if( clif_skill_nodamage(src,bl,skill_id,skill_lv,

-			sc_start2(bl,type,100,skill_lv,src->id,skill_get_time(skill_id,skill_lv)) ) )

-			sc_start2(src,type,100,skill_lv,bl->id,skill_get_time(skill_id,skill_lv));

+			sc_start2(src,bl,type,100,skill_lv,src->id,skill_get_time(skill_id,skill_lv)) ) )