From f01620acefb94a22384b8d0fa4b96f50962f4f6a Mon Sep 17 00:00:00 2001 From: oranges Date: Wed, 11 Apr 2018 22:01:12 +1200 Subject: [PATCH] Merge pull request #36693 from kevinz000/patch-471 Slightly bandaid fix for ntnet json/xorencrypt runtimes --- code/modules/NTNet/netdata.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/NTNet/netdata.dm b/code/modules/NTNet/netdata.dm index d84ab43a6a..a5d7cc0efa 100644 --- a/code/modules/NTNet/netdata.dm +++ b/code/modules/NTNet/netdata.dm @@ -14,7 +14,9 @@ /datum/netdata/proc/pre_send(datum/component/ntnet_interface/interface) // Decrypt the passkey. if(encrypted_passkey && !passkey) - passkey = json_decode(XorEncrypt(hextostr(encrypted_passkey, TRUE), SScircuit.cipherkey)) + var/result = XorEncrypt(hextostr(encrypted_passkey, TRUE), SScircuit.cipherkey) + if(length(result) > 1) + passkey = json_decode(XorEncrypt(hextostr(encrypted_passkey, TRUE), SScircuit.cipherkey)) // Encrypt the passkey. if(!encrypted_passkey && passkey)