diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-08-07 09:26:17 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-08-07 09:26:17 -0300 |
| commit | c53f8a099151f2e8c26c0ab36f35d34256c0d6cb (patch) | |
| tree | 0558845f1cb8070f39f9af424c8ffcd930a33b90 /src/map/trade.c | |
| parent | f18ad8f29090dd7c95b47922aabfb5e5569c7630 (diff) | |
| download | hercules-r12.4+1.tar.gz hercules-r12.4+1.tar.bz2 hercules-r12.4+1.tar.xz hercules-r12.4+1.zip | |
This is Hercules v2019.08.25r12.4+1
Diffstat (limited to 'src/map/trade.c')
| -rw-r--r-- | src/map/trade.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/trade.c b/src/map/trade.c index cef14ffe6..ff5c04fc3 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -50,6 +50,9 @@ static void trade_traderequest(struct map_session_data *sd, struct map_session_d { nullpo_retv(sd); + if (sd == target_sd) + return; + if (map->list[sd->bl.m].flag.notrade) { clif->message (sd->fd, msg_sd(sd,272)); // You can't trade in this map return; @@ -223,9 +226,9 @@ static int impossible_trade_check(struct map_session_data *sd) if (inventory[index].amount < sd->deal.item[i].amount) { // if more than the player have -> hack snprintf(message_to_gm, sizeof(message_to_gm), msg_txt(538), sd->status.name, sd->status.account_id); // Hack on trade: character '%s' (account: %d) try to trade more items that he has. - intif->wis_message_to_gm(map->wisp_server_name, PC_PERM_RECEIVE_HACK_INFO, message_to_gm); + pc->wis_message_to_gm(map->wisp_server_name, PC_PERM_RECEIVE_HACK_INFO, message_to_gm); snprintf(message_to_gm, sizeof(message_to_gm), msg_txt(539), inventory[index].amount, inventory[index].nameid, sd->deal.item[i].amount); // This player has %d of a kind of item (id: %d), and try to trade %d of them. - intif->wis_message_to_gm(map->wisp_server_name, PC_PERM_RECEIVE_HACK_INFO, message_to_gm); + pc->wis_message_to_gm(map->wisp_server_name, PC_PERM_RECEIVE_HACK_INFO, message_to_gm); // if we block people if (battle_config.ban_hack_trade < 0) { chrif->char_ask_name(-1, sd->status.name, CHAR_ASK_NAME_BLOCK, 0, 0, 0, 0, 0, 0); @@ -242,7 +245,7 @@ static int impossible_trade_check(struct map_session_data *sd) // message about the ban safestrncpy(message_to_gm, msg_txt(508), sizeof(message_to_gm)); // This player hasn't been banned (Ban option is disabled). - intif->wis_message_to_gm(map->wisp_server_name, PC_PERM_RECEIVE_HACK_INFO, message_to_gm); + pc->wis_message_to_gm(map->wisp_server_name, PC_PERM_RECEIVE_HACK_INFO, message_to_gm); return 1; } inventory[index].amount -= sd->deal.item[i].amount; // remove item from inventory |