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/trade.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/trade.c')
| -rw-r--r-- | src/map/trade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/trade.c b/src/map/trade.c index 9c284ba23..cef14ffe6 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -163,8 +163,8 @@ static void trade_tradeack(struct map_session_data *sd, int type) } //Check if you can start trade. - if (sd->npc_id || sd->state.vending || sd->state.buyingstore || sd->state.storage_flag != STORAGE_FLAG_CLOSED - || tsd->npc_id || tsd->state.vending || tsd->state.buyingstore || tsd->state.storage_flag != STORAGE_FLAG_CLOSED + if (sd->npc_id || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->state.storage_flag != STORAGE_FLAG_CLOSED + || tsd->npc_id || tsd->state.vending || tsd->state.prevend || tsd->state.buyingstore || tsd->state.storage_flag != STORAGE_FLAG_CLOSED ) { //Fail clif->tradestart(sd, 2); |