Changeset 105

Timestamp:

10/14/07 14:23:35 (3 years ago)

Author:

elghinn

Message:

 

Files:

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

adventure/world.py

@@ -105 +105 @@
             msg.subject = 'Adventure component help'
             msg.body = 'You don\'t need to subscribe to my presence. Simply use your Jabber client to join the MUC or conference at #{pres.to.strip}'
-            send(None, msg)
+            self.send(None, msg)
             return True
 
@@ -119 +119 @@
                 answer.setType('error')
                 #answer.add(Jabber::Error.new('not-acceptable', 'Nickchange not allowed'))
-                send(thing.name, answer)
+                self.send(thing.name, answer)
                 return True
 
@@ -125 +125 @@
         if player and pres.getFrom() != player.jid and len(pres.getTo().getResource()):
             answer = pres.answer
-            answersetType('error')
-            if len(pres.getTo().getResource()):
-                answer.add(Jabber::Error::new('conflict', 'Nickname already used'))
-            else:
-                answer.add(Jabber::Error::new('not-acceptable', 'Please use a nickname'))
-            send(None, answer)
+            answer.setType('error')
+            #if len(pres.getTo().getResource()):
+            #    answer.add(Jabber::Error::new('conflict', 'Nickname already used'))
+            #else:
+            #    answer.add(Jabber::Error::new('not-acceptable', 'Please use a nickname'))
+            self.send(None, answer)
             return True
 
@@ -147 +147 @@
                 pres = Presence(node=player.presence)
                 pres.to = t.jid
-                send(player.iname, pres)
+                self.send(player.iname, pres)
     
         # Remove the player instantly
@@ -164 +164 @@
             answer.setType('error')
             #answer.add(Jabber::Error::new('forbidden'))
-            send(msg.getTo().getResource(), answer)
+            self.send(msg.getTo().getResource(), answer)
             return True