From 6bad4d6401078d05dfd2bb5ede49af28c57a0e11 Mon Sep 17 00:00:00 2001 From: Dreomite Date: Wed, 18 Nov 2020 19:19:14 +0300 Subject: [PATCH] Temporarily fix VT2 3.4.0 crash related to networking --- vmf/scripts/mods/vmf/modules/core/chat.lua | 14 ++++++++++---- vmf/scripts/mods/vmf/modules/core/network.lua | 7 +++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/vmf/scripts/mods/vmf/modules/core/chat.lua b/vmf/scripts/mods/vmf/modules/core/chat.lua index 6439b85..ba9d72f 100644 --- a/vmf/scripts/mods/vmf/modules/core/chat.lua +++ b/vmf/scripts/mods/vmf/modules/core/chat.lua @@ -21,8 +21,11 @@ local function send_system_message(peer_id, message) RPC.rpc_chat_message(peer_id, CHANNEL_ID, MESSAGE_SENDER, message, LOCALIZATION_PARAM, IS_SYSTEM_MESSAGE, POP_CHAT, IS_DEV) else - RPC.rpc_chat_message(peer_id, CHANNEL_ID, MESSAGE_SENDER, LOCAL_PLAYER_ID, message, LOCALIZATION_PARAMETERS, - LOCALIZE, LOCALIZE_PARAMETERS, IS_SYSTEM_MESSAGE, POP_CHAT, IS_DEV) + local major_version, minor_version = VersionSettings.version:match("^(%d+)%.(%d+)") + if major_version == 3 and minor_version < 4 then + RPC.rpc_chat_message(peer_id, CHANNEL_ID, MESSAGE_SENDER, LOCAL_PLAYER_ID, message, LOCALIZATION_PARAMETERS, + LOCALIZE, LOCALIZE_PARAMETERS, IS_SYSTEM_MESSAGE, POP_CHAT, IS_DEV) + end end end @@ -30,8 +33,11 @@ local function add_system_message_to_chat(chat_manager, message) if VT1 then chat_manager:_add_message_to_list(CHANNEL_ID, MESSAGE_SENDER, message, IS_SYSTEM_MESSAGE, POP_CHAT, IS_DEV) else - chat_manager:_add_message_to_list(CHANNEL_ID, MESSAGE_SENDER, LOCAL_PLAYER_ID, message, IS_SYSTEM_MESSAGE, POP_CHAT, - IS_DEV) + local major_version, minor_version = VersionSettings.version:match("^(%d+)%.(%d+)") + if major_version == 3 and minor_version < 4 then + chat_manager:_add_message_to_list(CHANNEL_ID, MESSAGE_SENDER, LOCAL_PLAYER_ID, message, IS_SYSTEM_MESSAGE, POP_CHAT, + IS_DEV) + end end end diff --git a/vmf/scripts/mods/vmf/modules/core/network.lua b/vmf/scripts/mods/vmf/modules/core/network.lua index 0e37d5a..3f23da8 100644 --- a/vmf/scripts/mods/vmf/modules/core/network.lua +++ b/vmf/scripts/mods/vmf/modules/core/network.lua @@ -137,8 +137,11 @@ local function rpc_chat_message(member, channel_id, message_sender, message, loc RPC.rpc_chat_message(member, channel_id, message_sender, message, localization_param, is_system_message, pop_chat, is_dev) else - RPC.rpc_chat_message(member, channel_id, message_sender, 0, message, {localization_param}, false, false, - is_system_message, pop_chat, is_dev) + local major_version, minor_version = VersionSettings.version:match("^(%d+)%.(%d+)") + if major_version == 3 and minor_version < 4 then + RPC.rpc_chat_message(member, channel_id, message_sender, 0, message, {localization_param}, false, false, + is_system_message, pop_chat, is_dev) + end end end