summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-14 06:27:30 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-14 06:27:30 +0000
commit5731ba51f3620d02e56b26e03daaf711c40145c2 (patch)
tree4dbffe1cf3d14da4d22304aa6bd18e0df7f9a776
parentb4d6d1d59351505a52cce0d5c53d542b83016ad0 (diff)
downloadhercules-5731ba51f3620d02e56b26e03daaf711c40145c2.tar.gz
hercules-5731ba51f3620d02e56b26e03daaf711c40145c2.tar.bz2
hercules-5731ba51f3620d02e56b26e03daaf711c40145c2.tar.xz
hercules-5731ba51f3620d02e56b26e03daaf711c40145c2.zip
Fix to progressbar exploit, bugreport:5199
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15442 54d463be-8e91-2dee-dedb-b68131a5f0ec
-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;