summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-18 16:08:50 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-06-18 16:08:50 +0000
commit9ff983f4f77c0da8a0a1cd4b88d13796184e7929 (patch)
tree884431a8538153af6271d1591d25b018b408a7e3
parentb55e11eec98aa968500e6b63729c9bb813427fe4 (diff)
downloadhercules-9ff983f4f77c0da8a0a1cd4b88d13796184e7929.tar.gz
hercules-9ff983f4f77c0da8a0a1cd4b88d13796184e7929.tar.bz2
hercules-9ff983f4f77c0da8a0a1cd4b88d13796184e7929.tar.xz
hercules-9ff983f4f77c0da8a0a1cd4b88d13796184e7929.zip
* Fixed using @refresh while having vending or buyingstore open would stuck the character (bugreport:156 , since r1307).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14857 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/clif.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9a2ebd81f..af6c32505 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011/06/18
+ * Fixed using @refresh while having vending or buyingstore open would stuck the character (bugreport:156 , since r1307). [Ai4rei]
* Fixed missing strlib.h include for compilers without own 'strnlen' implementation (since r14853). [Ai4rei]
2011/06/16
* Slight speedup on most strdb operations [ultramage]
diff --git a/src/map/clif.c b/src/map/clif.c
index ac8382a63..61bc46402 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7664,6 +7664,8 @@ int clif_refresh(struct map_session_data *sd)
clif_weather_check(sd);
if( sd->chatID )
chat_leavechat(sd,0);
+ if( sd->state.vending )
+ clif_openvending(sd, sd->bl.id, sd->vending);
if( pc_issit(sd) )
clif_sitting(&sd->bl); // FIXME: just send to self, not area
if( pc_isdead(sd) ) //When you refresh, resend the death packet.
@@ -7671,6 +7673,9 @@ int clif_refresh(struct map_session_data *sd)
else
clif_changed_dir(&sd->bl, SELF);
+ // unlike vending, resuming buyingstore crashes the client.
+ buyingstore_close(sd);
+
#ifndef TXT_ONLY
mail_clear(sd);
#endif