summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/map/npc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 026e61c0d..3859d8c68 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1155,6 +1155,13 @@ int npc_scriptcont(struct map_session_data* sd, int id)
**/
sd->npc_idle_tick = gettick();
#endif
+
+ /**
+ * WPE can get to this point with a progressbar; we deny it.
+ **/
+ if( sd->progressbar.npc_id && DIFF_TICK(sd->progressbar.timeout,gettick()) > 0 )
+ return 1;
+
run_script_main(sd->st);
return 0;