cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge skew from NTNet components (#7549)

Browse Source 
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-08-16 00:12:35 +02:00
committed by GitHub
parent 430d8712ee
commit 0331c496c7
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/components/ntnet/ntnet_reciever.dm
+3 -3
View File
@@ -45,15 +45,15 @@
return
if(COMPONENT_TRIGGERED_BY(data_type_options, port))
data_package.set_datatype(data_type_options.input_value)
data_package.set_datatype(data_type_options.value)
if(COMPONENT_TRIGGERED_BY(secondary_data_type_options, port))
secondary_package.set_datatype(secondary_data_type_options.input_value)
secondary_package.set_datatype(secondary_data_type_options.value)
/obj/item/circuit_component/ntnet_receive/proc/ntnet_receive(datum/source, datum/netdata/data)
SIGNAL_HANDLER
if(data.data["enc_key"] != enc_key.input_value)
if(data.data["enc_key"] != enc_key.value)
return
data_package.set_output(data.data["data"])
code/modules/wiremod/components/ntnet/ntnet_request.dm
+6 -6
View File
@@ -24,14 +24,14 @@
/obj/item/circuit_component/ntnet_send/input_received(datum/port/input/port)
. = ..()
if(. || !data_package.input_value)
if(. || !data_package.value)
return
var/list/datalist = list("data" = data_package.input_value)
if(secondary_package.input_value)
datalist["data_secondary"] = secondary_package.input_value
if(enc_key.input_value)
datalist["enc_key"] = enc_key.input_value
var/list/datalist = list("data" = data_package.value)
if(secondary_package.value)
datalist["data_secondary"] = secondary_package.value
if(enc_key.value)
datalist["enc_key"] = enc_key.value
var/datum/netdata/data = new(datalist)
data.receiver_id = __NETWORK_CIRCUITS
ntnet_send(data)