From dbc30dee6ed5e667523be1069700825812b6a716 Mon Sep 17 00:00:00 2001 From: m Date: Mon, 9 May 2022 20:02:53 -0500 Subject: [PATCH 1/2] only return node frames on non-dedi instances --- src/Components/Modules/Node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Modules/Node.cpp b/src/Components/Modules/Node.cpp index 9ed8e9c9..8955fe0c 100644 --- a/src/Components/Modules/Node.cpp +++ b/src/Components/Modules/Node.cpp @@ -167,7 +167,7 @@ namespace Components void Node::RunFrame() { - if (ServerList::useMasterServer) return; + if (!Dedicated::IsEnabled() && ServerList::useMasterServer) return; if (Dedicated::IsEnabled() && Dedicated::SVLanOnly.get()) return; if (!Dedicated::IsEnabled() && *Game::clcState > 0) From 88a6bd5887f337e635db9bfa703ea93f0378df19 Mon Sep 17 00:00:00 2001 From: m Date: Tue, 10 May 2022 06:22:36 -0500 Subject: [PATCH 2/2] cleanup if statements? --- src/Components/Modules/Node.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Components/Modules/Node.cpp b/src/Components/Modules/Node.cpp index 8955fe0c..6f112469 100644 --- a/src/Components/Modules/Node.cpp +++ b/src/Components/Modules/Node.cpp @@ -167,13 +167,17 @@ namespace Components void Node::RunFrame() { - if (!Dedicated::IsEnabled() && ServerList::useMasterServer) return; if (Dedicated::IsEnabled() && Dedicated::SVLanOnly.get()) return; - if (!Dedicated::IsEnabled() && *Game::clcState > 0) + if (!Dedicated::IsEnabled()) { - wasIngame = true; - return; // don't run while ingame because it can still cause lag spikes on lower end PCs + if (ServerList::useMasterServer) return; // don't run node frame if master server is active + + if (*Game::clcState > 0) + { + wasIngame = true; + return; // don't run while ingame because it can still cause lag spikes on lower end PCs + } } if (wasIngame) // our last frame we were ingame and now we aren't so touch all nodes