diff options
| author | Haru <haru@dotalux.com> | 2019-05-05 23:23:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 23:23:05 +0200 |
| commit | b1970eac663b641b93e30ec24f2b3d8ee02ce8f6 (patch) | |
| tree | f363d01b6181e4cfcdad109dc6d56873a73eaa15 /src/map/atcommand.c | |
| parent | aa79da0e801a536b22911d47fd12df351c36214e (diff) | |
| parent | b8ce5e9e1352abc45b08f92eb50890f202b1b230 (diff) | |
| download | hercules-b1970eac663b641b93e30ec24f2b3d8ee02ce8f6.tar.gz hercules-b1970eac663b641b93e30ec24f2b3d8ee02ce8f6.tar.bz2 hercules-b1970eac663b641b93e30ec24f2b3d8ee02ce8f6.tar.xz hercules-b1970eac663b641b93e30ec24f2b3d8ee02ce8f6.zip | |
Merge pull request #2432 from 4144/updatepackets
Update packets up to 2019-05-02
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index fa4436eed..8bca17fa1 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -868,7 +868,7 @@ ACMD(speed) *------------------------------------------*/ ACMD(storage) { - if (sd->npc_id || sd->state.vending || sd->state.buyingstore || sd->state.trading || sd->state.storage_flag) + if (sd->npc_id || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->state.trading || sd->state.storage_flag) return false; if (storage->open(sd) == 1) { //Already open. @@ -891,7 +891,7 @@ ACMD(guildstorage) return false; } - if (sd->npc_id || sd->state.vending || sd->state.buyingstore || sd->state.trading) + if (sd->npc_id || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->state.trading) return false; if (sd->state.storage_flag == STORAGE_FLAG_NORMAL) { @@ -5425,7 +5425,7 @@ ACMD(clearcart) return false; } - if (sd->state.vending) { + if (sd->state.vending || sd->state.prevend) { clif->message(fd, msg_fd(fd,548)); // You can't clean a cart while vending! return false; } |