deal with optional field on CT packet appropriately

This commit is contained in:
cidoku 2026-03-22 14:37:36 -03:00
parent f1c14c3215
commit 1d349bf8b3
2 changed files with 2 additions and 2 deletions

View File

@ -610,7 +610,7 @@ class AOServerInfo(QtCore.QThread):
continue continue
name = decodeAOString(network[1].decode('utf-8')) name = decodeAOString(network[1].decode('utf-8'))
chatmsg = decodeAOString(network[2].decode('utf-8').replace("\n", "<br />")) chatmsg = decodeAOString(network[2].decode('utf-8').replace("\n", "<br />"))
joinOOC.append("<b>%s:</b> %s" % (name, chatmsg.replace("<", "&lt;").replace("&lt;br />","<br />") if len(network) > 3 and network[3] == "0" else chatmsg)) joinOOC.append("<b>%s:</b> %s" % (name, chatmsg.replace("<", "&lt;").replace("&lt;br />","<br />") if len(network) <= 3 or (len(network) > 3 and network[3] == "0") else chatmsg))
elif header == 'PU': elif header == 'PU':
del network[0] del network[0]

View File

@ -129,7 +129,7 @@ def handlePackets(caller, total, record=True):
elif header == 'CT': elif header == 'CT':
name = decodeAOString(network[1].decode('utf-8')) name = decodeAOString(network[1].decode('utf-8'))
chatmsg = decodeAOString(network[2].decode('utf-8').replace("\n", "<br />")) chatmsg = decodeAOString(network[2].decode('utf-8').replace("\n", "<br />"))
caller.OOC_Log.emit("<b>%s:</b> %s" % (name, chatmsg.replace("<", "&lt;").replace("&lt;br />","<br />") if len(network) > 3 and network[3] == "0" else chatmsg)) caller.OOC_Log.emit("<b>%s:</b> %s" % (name, chatmsg.replace("<", "&lt;").replace("&lt;br />","<br />") if len(network) <= 3 or (len(network) > 3 and network[3] == "0") else chatmsg))
elif header == 'PV': elif header == 'PV':
caller.newChar.emit(int(network[3])) caller.newChar.emit(int(network[3]))