Changeset 106

Timestamp:

10/14/07 14:27:41 (2 years ago)

Author:

elghinn

Message:

 

Files:

• adventure/world.py (modified) (3 diffs)

adventure/world.py

@@ -10 +10 @@
         self.muc = muc
         self.places = dict() # {'place_name': place, ...}
-        self.things = dict() 
+        self.things = dict()
+        self.players = dict()
 
         doc = xml_parse(filename).documentElement
@@ -135 +136 @@
         # Add the valid player
         if not player:
-            player = add(Player(self, pres.getTo().getResource(), pres.getFrom()))
+            player = Player(self, pres.getTo().getResource(), pres.getFrom())
             player.presence = pres
+            self.players[player.name] = player
             move_thing(player, attributes['start'])
             player.send_message('Help!', 'Send "?" to get a list of available commands any time.')
@@ -150 +152 @@
     
         # Remove the player instantly
-        if pres.type == :error || pres.type == :unavailable :
-            move_thing(player, None)
-            delete_element(player)
+        if pres.getType() in ('error', 'unavailable'):
+            self.move_thing(player, None)
+            del self.players[player.name]
 
     def handle_message(msg):
         player = None
         for thing in self.things.values():
-            if isinstance(thing, Player) and msg.getTo().getResource() == None && msg.getFrom() == thing.jid:
+            if isinstance(thing, Player) and msg.getTo().getResource() == None and msg.getFrom() == thing.jid:
                 player = thing