From d64aa9be248ce5523da0d9c31d5763c1faf573f5 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Tue, 25 Sep 2018 16:46:00 -0400 Subject: [PATCH] Remove null propagation --- src/DMAPI/tgs/v4/api.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/DMAPI/tgs/v4/api.dm b/src/DMAPI/tgs/v4/api.dm index bf17051d90..9d74610f9c 100644 --- a/src/DMAPI/tgs/v4/api.dm +++ b/src/DMAPI/tgs/v4/api.dm @@ -150,7 +150,8 @@ if(event_parameters) event_call += event_parameters - event_handler?.HandleEvent(arglist(event_call)) + if(event_handler != null) + event_handler.HandleEvent(arglist(event_call)) . = json_encode(intercepted_message_queue) intercepted_message_queue = null @@ -165,13 +166,15 @@ //the topic still completes, miraculously //I honestly didn't believe byond could do it - event_handler?.HandleEvent(TGS_EVENT_PORT_SWAP, new_port) + if(event_handler != null) + event_handler.HandleEvent(TGS_EVENT_PORT_SWAP, new_port) if(!world.OpenPort(new_port)) return "Port change failed!" return if(TGS4_TOPIC_CHANGE_REBOOT_MODE) var/new_reboot_mode = text2num(params[TGS4_PARAMETER_DATA]) - event_handler?.HandleEvent(TGS_EVENT_REBOOT_MODE_CHANGE, reboot_mode, new_reboot_mode) + if(event_handler != null) + event_handler.HandleEvent(TGS_EVENT_REBOOT_MODE_CHANGE, reboot_mode, new_reboot_mode) reboot_mode = new_reboot_mode return