summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDipesh Amin <yaypunkrock@gmail.com>2011-09-01 13:40:10 +0100
committerDipesh Amin <yaypunkrock@gmail.com>2011-09-01 13:40:10 +0100
commit2fdcd2ac566cf40386b7e392bead1137c68f722a (patch)
tree188b49d269570c86791a4725341f3b0c402c29a8
parentff76f98a0e8d519c08938fa44b77d70294e8cb1e (diff)
downloadmanamarket-2fdcd2ac566cf40386b7e392bead1137c68f722a.tar.gz
manamarket-2fdcd2ac566cf40386b7e392bead1137c68f722a.tar.bz2
manamarket-2fdcd2ac566cf40386b7e392bead1137c68f722a.tar.xz
manamarket-2fdcd2ac566cf40386b7e392bead1137c68f722a.zip
oops and again for money
-rwxr-xr-xmain.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.py b/main.py
index 0ddb00c..01604cb 100755
--- a/main.py
+++ b/main.py
@@ -180,12 +180,12 @@ def process_whisper(nick, msg, mapserv):
if amount == 0:
mapserv.sendall(whisper(nick, "You have no money to collect."))
else:
- trader_state.money = nick
if not trader_state.Trading.testandset():
mapserv.sendall(whisper(nick, "I'm currently busy with a trade. Try again shortly"))
return
- player_id = beingManager.findId(nick)
+ trader_state.money = nick
+ player_id = beingManager.findId(nick)
if player_id != -10:
mapserv.sendall(trade_request(player_id))
trader_state.timer = time.time()