diff options
| author | Michieru <Michieru@users.noreply.github.com> | 2014-11-03 20:05:53 +0100 |
|---|---|---|
| committer | Michieru <Michieru@users.noreply.github.com> | 2014-11-03 20:05:53 +0100 |
| commit | ea85ad9514c6d1e64457c215294a7090831d971b (patch) | |
| tree | e75d66f7e068d5d4df567182d0739a7a03307fcc /src/map/clif.c | |
| parent | 715af9d93adf4e07f11ff09a6a1b55d49d32849d (diff) | |
| parent | 82037b89b33c3fa2a5cfaf33038fbf9ebddea17f (diff) | |
| download | hercules-ea85ad9514c6d1e64457c215294a7090831d971b.tar.gz hercules-ea85ad9514c6d1e64457c215294a7090831d971b.tar.bz2 hercules-ea85ad9514c6d1e64457c215294a7090831d971b.tar.xz hercules-ea85ad9514c6d1e64457c215294a7090831d971b.zip | |
Merge pull request #363 from EPuncker/master
Added 4 new permissions
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index f5f1c5512..169f30793 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10902,7 +10902,7 @@ void clif_parse_NpcBuyListSend(int fd, struct map_session_data* sd) unsigned short* item_list = (unsigned short*)RFIFOP(fd,4); int result; - if( sd->state.trading || !sd->npc_shopid ) + if( sd->state.trading || !sd->npc_shopid || pc_has_permission(sd,PC_PERM_DISABLE_STORE) ) result = 1; else result = npc->buylist(sd,n,item_list); @@ -15621,7 +15621,7 @@ void clif_parse_cashshop_buy(int fd, struct map_session_data *sd) int fail = 0; nullpo_retv(sd); - if( sd->state.trading || !sd->npc_shopid ) + if( sd->state.trading || !sd->npc_shopid || pc_has_permission(sd,PC_PERM_DISABLE_STORE) ) fail = 1; else { #if PACKETVER < 20101116 |