From d1d1a196ea5ccb8d6c89f0948c45d3ee67fe64df Mon Sep 17 00:00:00 2001 From: Aleos Date: Thu, 30 Apr 2020 08:54:20 -0400 Subject: [PATCH] Adds a warping state check Thanks to @Lemongrass3110! --- src/map/clif.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 3dcdbd338c..de95c0e762 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -19037,7 +19037,11 @@ void clif_parse_reqworldinfo(int fd,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) { - status_change_end(&sd->bl, SC_BLOCKING_PLAY, INVALID_TIMER); + if (sd == nullptr) + return; + + if (sd->state.warping == 0) + status_change_end(&sd->bl, SC_BLOCKING_PLAY, INVALID_TIMER); } /// req world info (CZ_CLIENT_VERSION)