summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDipesh Amin <yaypunkrock@gmail.com>2011-09-03 18:03:04 +0100
committerDipesh Amin <yaypunkrock@gmail.com>2011-09-03 18:03:04 +0100
commite4ee3aa1f48b00e7dc0f49458c39a84890d6ee0a (patch)
tree71e22b488d7b718c1298e2e7583983e27e029489
parentc70d13af99f96317bb6a7ec4d94c365fd73e2854 (diff)
downloadmanamarket-e4ee3aa1f48b00e7dc0f49458c39a84890d6ee0a.tar.gz
manamarket-e4ee3aa1f48b00e7dc0f49458c39a84890d6ee0a.tar.bz2
manamarket-e4ee3aa1f48b00e7dc0f49458c39a84890d6ee0a.tar.xz
manamarket-e4ee3aa1f48b00e7dc0f49458c39a84890d6ee0a.zip
Change this back for now, until I can figure out the exact behavior.
-rwxr-xr-xmain.py7
1 files changed, 1 insertions, 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.")