summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDipesh Amin <yaypunkrock@gmail.com>2011-08-22 11:59:58 +0100
committerDipesh Amin <yaypunkrock@gmail.com>2011-08-22 11:59:58 +0100
commit2fdc157430b64a7d894fe787dd09b1810b95b96b (patch)
treefbc6c872351b0686a62e0e3c80607f151973bb6a
parentb9e937fa64f05670f590d7bfc67d537e4834f0ab (diff)
downloadmanamarket-2fdc157430b64a7d894fe787dd09b1810b95b96b.tar.gz
manamarket-2fdc157430b64a7d894fe787dd09b1810b95b96b.tar.bz2
manamarket-2fdc157430b64a7d894fe787dd09b1810b95b96b.tar.xz
manamarket-2fdc157430b64a7d894fe787dd09b1810b95b96b.zip
Revert "Inventory/Money Check."
This reverts commit 73691da56f541ea1730043d0e654d97414dcb92a.
-rwxr-xr-xmain.py25
1 files changed, 0 insertions, 25 deletions
diff --git a/main.py b/main.py
index 8659967..965b8ce 100755
--- a/main.py
+++ b/main.py
@@ -801,31 +801,6 @@ def main():
logging.info("Name: %s, Id: %s, Index: %s, Amount: %s.", \
ItemDB.getItem(player_node.inventory[item].itemId).name, \
player_node.inventory[item].itemId, item, player_node.inventory[item].amount)
-
- # Check the inventory state and the amount of money match the information saved.
- amount = -1
- test_node = player_node.inventory
- for item in test_node:
- amount = test_node[item].amount
- for elem in sale_tree.root:
- if int(elem.get('itemId')) == test_node[item].itemId \
- and int(elem.get('amount')) >= amount:
- amount -= int(elem.get('amount'))
-
- if amount == 0:
- del test_node[item]
-
- if amount < 0:
- logging.info("Server and client inventory out of sync.")
- exit(0)
-
- total_money = 0
- for user in user_tree:
- total_money += int(user.get('money'))
-
- if total_money > player_node.MONEY:
- logging.info("Server and client money out of sync.")
- exit(0)
elif packet.is_type(SMSG_TRADE_REQUEST):
name = packet.read_string(24)