Minor cleanups

src/map/clif.cpp

@@ -19267,9 +19267,8 @@ static void clif_loadConfirm( struct map_session_data *sd ){
 
 /// Enable playing abilities of a player if map is done loading.
 /// 0447 (CZ_BLOCKING_PLAY_CANCEL)
-void clif_parse_blocking_playcancel(int fd,struct map_session_data *sd) {
-	if (sd == nullptr)
-		return;
+void clif_parse_blocking_playcancel( int fd,struct map_session_data *sd ){
+	nullpo_retv(sd);
 
 	if (sd->state.warping == 0)
 		clif_loadConfirm(sd);

src/map/pc.cpp

@@ -5946,8 +5946,8 @@ enum e_setpos pc_setpos(struct map_session_data* sd, unsigned short mapindex, in
 
 		sd->state.pmap = sd->bl.m;
 
-		if (battle_config.blocking_play_delay)
-			sc_start(&sd->bl, &sd->bl, SC_BLOCKING_PLAY, 100, 0, 0);
+		if (battle_config.blocking_play_delay > 0)
+			sc_start(&sd->bl, &sd->bl, SC_BLOCKING_PLAY, 100, 0, battle_config.blocking_play_delay);
 
 		if (sc && sc->count) { // Cancel some map related stuff.
 			if (sc->data[SC_JAILED])

src/map/skill.cpp

@@ -2035,7 +2035,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
 					case SC_LHZ_DUN_N1:		case SC_LHZ_DUN_N2:			case SC_LHZ_DUN_N3:			case SC_LHZ_DUN_N4:
 					case SC_ENTRY_QUEUE_APPLY_DELAY:	case SC_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT:
 					case SC_REUSE_LIMIT_LUXANIMA:	case SC_LUXANIMA:	case SC_SOULENERGY:
-          case SC_BLOCKING_PLAY:
+					case SC_BLOCKING_PLAY:
 						continue;
 					case SC_WHISTLE:		case SC_ASSNCROS:		case SC_POEMBRAGI:
 					case SC_APPLEIDUN:		case SC_HUMMING:		case SC_DONTFORGETME:
@@ -8517,7 +8517,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 					case SC_DRESSUP:		case SC_HANBOK:			case SC_OKTOBERFEST:
 					case SC_LHZ_DUN_N1:		case SC_LHZ_DUN_N2:			case SC_LHZ_DUN_N3:			case SC_LHZ_DUN_N4:
 					case SC_REUSE_LIMIT_LUXANIMA:	case SC_LUXANIMA:	case SC_SOULENERGY:
-          case SC_BLOCKING_PLAY:
+					case SC_BLOCKING_PLAY:
 						continue;
 					case SC_WHISTLE:
 					case SC_ASSNCROS:
@@ -10011,7 +10011,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 					case SC_LHZ_DUN_N1:		case SC_LHZ_DUN_N2:			case SC_LHZ_DUN_N3:			case SC_LHZ_DUN_N4:
 					case SC_ENTRY_QUEUE_APPLY_DELAY:	case SC_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT:
 					case SC_REUSE_LIMIT_LUXANIMA:		case SC_LUXANIMA:	case SC_SOULENERGY:
-          case SC_BLOCKING_PLAY:
+					case SC_BLOCKING_PLAY:
 					continue;
 				case SC_ASSUMPTIO:
 					if( bl->type == BL_MOB )

src/map/status.cpp

@@ -10571,10 +10571,6 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 			}
 			break;
 
-		case SC_BLOCKING_PLAY:
-			tick = battle_config.blocking_play_delay;
-			break;
-
 		case SC_STONE:
 			val3 = max(val3, 100); // Incubation time
 			val4 = max(tick-val3, 100); // Petrify time