From 5731ba51f3620d02e56b26e03daaf711c40145c2 Mon Sep 17 00:00:00 2001
From: shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 14 Jan 2012 06:27:30 +0000
Subject: Fix to progressbar exploit, bugreport:5199

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15442 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/npc.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/map/npc.c')

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;
-- 
cgit v1.2.3-60-g2f50