From e4ee3aa1f48b00e7dc0f49458c39a84890d6ee0a Mon Sep 17 00:00:00 2001 From: Dipesh Amin Date: Sat, 3 Sep 2011 18:03:04 +0100 Subject: Change this back for now, until I can figure out the exact behavior. --- main.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/main.py b/main.py index 49a1970..23347df 100755 --- a/main.py +++ b/main.py @@ -860,6 +860,7 @@ def main(): mapserv.sendall(trade_add_item(0-inventory_offset, amount)) mapserv.sendall(str(PacketOut(CMSG_TRADE_ADD_COMPLETE))) mapserv.sendall(str(PacketOut(CMSG_TRADE_OK))) + trader_state.complete = 1 else: logging.info("Trade response: Trade cancelled") @@ -916,12 +917,6 @@ def main(): player_node.remove_item(index, amount) else: logging.info("Trade: Money Added: %s", str(amount)) - if trader_state.money: - amount_added = int(user_tree.get_user(trader_state.money).get('money')) - if amount != amount_added: - mapserv.sendall(str(PacketOut(CMSG_TRADE_CANCEL_REQUEST))) - else: - trader_state.complete = 1 elif response == 1: logging.info("Trade item add response: Failed - player overweight.") -- cgit v1.2.3-70-g09d2