diff options
| author | Haru <haru@dotalux.com> | 2018-08-24 23:21:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 23:21:00 +0200 |
| commit | cc25a7c300ab2f549d4f2760eafb0baaf7e032d5 (patch) | |
| tree | 3691382e27792e6eb7b5c9e5fd5d604d5d479446 /src/map/storage.c | |
| parent | b055e906a0941a6c07e8366a5cf9a559a37b52cf (diff) | |
| parent | bfdbfaadddf66d2eaa7b21cc5d7568aab1f3fc56 (diff) | |
| download | hercules-cc25a7c300ab2f549d4f2760eafb0baaf7e032d5.tar.gz hercules-cc25a7c300ab2f549d4f2760eafb0baaf7e032d5.tar.bz2 hercules-cc25a7c300ab2f549d4f2760eafb0baaf7e032d5.tar.xz hercules-cc25a7c300ab2f549d4f2760eafb0baaf7e032d5.zip | |
Merge pull request #2176 from 4144/updatepackets
Update packets to 2018-08-08
Diffstat (limited to 'src/map/storage.c')
| -rw-r--r-- | src/map/storage.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/storage.c b/src/map/storage.c index 4123ddc7c..ba8dcee3a 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -297,7 +297,7 @@ static int storage_add_from_inventory(struct map_session_data *sd, int index, in if (storage->additem(sd, &sd->status.inventory[index], amount) == 0) pc->delitem(sd, index, amount, 0, DELITEM_TOSTORAGE, LOG_TYPE_STORAGE); else - clif->dropitem(sd, index, 0); + clif->item_movefailed(sd, index); return 1; } @@ -398,7 +398,9 @@ static int storage_storagegettocart(struct map_session_data *sd, int index, int if ((flag = pc->cart_additem(sd, it, amount, LOG_TYPE_STORAGE)) == 0) storage->delitem(sd, index, amount); else { + // probably this line is useless? it remove inventory lock but not storage [4144] clif->dropitem(sd, index,0); + clif->cart_additem_ack(sd, flag == 1?0x0:0x1); } @@ -638,7 +640,7 @@ static int storage_guild_storageadd(struct map_session_data *sd, int index, int if( gstorage->additem(sd,stor,&sd->status.inventory[index],amount) == 0 ) pc->delitem(sd, index, amount, 0, DELITEM_TOSTORAGE, LOG_TYPE_GSTORAGE); else - clif->dropitem(sd, index, 0); + clif->item_movefailed(sd, index); return 1; } |