Mercurial > openrpg
changeset 571:71e52680f1cc 1.8.0
merge
| author | Digitalxero |
|---|---|
| date | Tue, 13 Apr 2010 15:43:21 -0400 |
| parents | 5422df5df070 (diff) 2b4491cef86f (current diff) |
| children | a7f95694ca50 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/networking/mplay_client.py Wed Apr 07 22:09:02 2010 -0500 +++ b/orpg/networking/mplay_client.py Tue Apr 13 15:43:21 2010 -0400 @@ -701,6 +701,8 @@ msg = data[end+1:] if msg[-6:] == '</msg>': msg = msg[:-6] + if not msg.startswith('<'): + msg = msg.replace('<', '<').replace('>', '>') if id == "0": self.on_receive(msg,None) # None get's interpreted in on_receive as the sys admin.
--- a/orpg/networking/mplay_server.py Wed Apr 07 22:09:02 2010 -0500 +++ b/orpg/networking/mplay_server.py Tue Apr 13 15:43:21 2010 -0400 @@ -1029,7 +1029,7 @@ def broadcast(self,msg): - self.send_to_all("0","<msg to='all' from='0' group_id='1'><font color='#FF0000'>" + msg + "</font>") + self.send_to_all("0","<msg to='all' from='0' group_id='1'/><font color='#FF0000'>" + msg + "</font>") def console_log(self): @@ -1428,7 +1428,7 @@ # See if we have a server name to report! - if len(self.serverName): + if self.serverName: lobbyMsg += ", named '" + self.serverName + "'." else: @@ -1713,7 +1713,7 @@ #because a time was sent return a ping response msg ="<ping time='" + str(sent_time) + "' />" else: - msg ="<msg to='" + player + "' from='" + player + "' group_id='" + group_id + "'><font color='#FF0000'>PONG!?!</font>" + msg ="<msg to='" + player + "' from='" + player + "' group_id='" + group_id + "'/><font color='#FF0000'>PONG!?!</font>" self.players[player].outbox.put(msg) xml_dom.unlink()