diff options
| author | panikon <panikon@zoho.com> | 2014-04-19 21:39:40 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-04-19 21:39:40 -0300 |
| commit | 31486a8c3340a8ca8a8b1e5dd9084c2c07ec8614 (patch) | |
| tree | 451f55c703d03d06d7035d61e1fded420634580a /src/map/unit.c | |
| parent | 97cd487deb324fb23d9f671d0c1ed739d52d5935 (diff) | |
| download | hercules-31486a8c3340a8ca8a8b1e5dd9084c2c07ec8614.tar.gz hercules-31486a8c3340a8ca8a8b1e5dd9084c2c07ec8614.tar.bz2 hercules-31486a8c3340a8ca8a8b1e5dd9084c2c07ec8614.tar.xz hercules-31486a8c3340a8ca8a8b1e5dd9084c2c07ec8614.zip | |
Follow up to 6f6a6b3
* Added new method to handle refreshing the storage window when it was closed automatically by the client
* http://hercules.ws/board/tracker/issue-8027-when-the-storage-is-open-you-can-use-self-skills
* http://hercules.ws/board/tracker/issue-7694-guild-notice
Follow up to d57781c
* Fixed minor typo as pointed by @MishimaHaruna
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 39fff0eab..151d4bad5 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -2138,11 +2138,14 @@ int unit_remove_map(struct block_list *bl, clr_type clrtype, const char* file, i trade->cancel(sd); buyingstore->close(sd); searchstore->close(sd); - if(sd->state.storage_flag == 1) - storage->pc_quit(sd,0); - else if (sd->state.storage_flag == 2) - gstorage->pc_quit(sd,0); - sd->state.storage_flag = 0; //Force close it when being warped. + if( sd->menuskill_id != AL_TELEPORT ) { // issue: 8027 + if(sd->state.storage_flag == 1) + storage->pc_quit(sd,0); + else if (sd->state.storage_flag == 2) + gstorage->pc_quit(sd,0); + + sd->state.storage_flag = 0; //Force close it when being warped. + } if(sd->party_invite>0) party->reply_invite(sd,sd->party_invite,0); if(sd->guild_invite>0) |