From 219a10d6a0cdad0312e5afd6a39b9faecf605200 Mon Sep 17 00:00:00 2001
From: FutureRave <edoardo.sanguineti222@gmail.com>
Date: Wed, 4 May 2022 00:26:53 +0100
Subject: [PATCH] [Dedicated] Actually fix sv_lanOnly

---
 src/Components/Modules/Dedicated.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Components/Modules/Dedicated.cpp b/src/Components/Modules/Dedicated.cpp
index da207d22..582bebb0 100644
--- a/src/Components/Modules/Dedicated.cpp
+++ b/src/Components/Modules/Dedicated.cpp
@@ -252,9 +252,15 @@ namespace Components
 	}
 
 	void Dedicated::Heartbeat()
-	{
-		int masterPort = Dvar::Var("masterPort").get<int>();
-		const char* masterServerName = Dvar::Var("masterServerName").get<const char*>();
+	{	
+		// Do not send a heartbeat if sv_lanOnly is set to true
+		if (Dedicated::SVLanOnly.get<bool>())
+		{
+			return;
+		}
+
+		auto masterPort = Dvar::Var("masterPort").get<int>();
+		const auto* masterServerName = Dvar::Var("masterServerName").get<const char*>();
 
 		Network::Address master(Utils::String::VA("%s:%u", masterServerName, masterPort));
 
@@ -386,12 +392,6 @@ namespace Components
 				{
 					static Utils::Time::Interval interval;
 
-					// Do not send an heartbeat if sv_lanOnly is set to true
-					if (Dedicated::SVLanOnly.get<bool>())
-					{
-						return;
-					}
-
 					if (Dvar::Var("sv_maxclients").get<int>() > 0 && interval.elapsed(2min))
 					{
 						interval.update();