Skip to content

Server: prevent Party auto-join when bAnnounceServer is true to prevent public server trolling #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miredirex merged 5 commits into from
Aug 22, 2026
Merged

Server: prevent Party auto-join when bAnnounceServer is true to prevent public server trolling #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7a8b32
server: prevent auto-join when bAnnounceServer is true
absol89 Jun 16, 2026
b505384
Compile fix
absol89 Jun 16, 2026
730e23f
server: clarify bAnnounceServer guard comment
absol89 Jun 16, 2026
2f858e5
server: guard OnPlayerJoin auto-join with bAnnounceServer
absol89 Jun 16, 2026
0b786a0
Move stuff to GameServer.h/.cpp, simplify code
miredirex Aug 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Code/server/GameServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Console::Setting bPremiumTickrate{"GameServer:bPremiumMode", "Use premium tick r
Console::StringSetting sServerName{"GameServer:sServerName", "Name that shows up in the server list", "Dedicated Together Server"};
Console::StringSetting sAdminPassword{"GameServer:sAdminPassword", "Admin authentication password", ""};
Console::StringSetting sPassword{"GameServer:sPassword", "Server password", ""};
Console::Setting bAnnounceServer{"LiveServices:bAnnounceServer", "Whether to list the server on the public server list", false};

// Gameplay
// TODO: to make this easier for users, use game names for difficulty instead of int
Expand Down Expand Up @@ -203,6 +204,16 @@ GameServer* GameServer::Get() noexcept
return s_pInstance;
}

bool GameServer::IsPublicServer() const noexcept
{
return bAnnounceServer;
}

bool GameServer::AllowsAutoPartyJoin() const noexcept
{
return bAutoPartyJoin && !IsPublicServer();
}

void GameServer::Initialize()
{
if (!CheckMoPo())
Expand Down
2 changes: 2 additions & 0 deletions Code/server/GameServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ struct GameServer final : Server

bool IsRunning() const noexcept { return !m_requestStop; }
bool IsPasswordProtected() const noexcept { return m_isPasswordProtected; }
[[nodiscard]] bool IsPublicServer() const noexcept;
[[nodiscard]] bool AllowsAutoPartyJoin() const noexcept;

template <class T> void ForEachAdmin(const T& aFunctor)
{
Expand Down
10 changes: 2 additions & 8 deletions Code/server/Services/PartyService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
#include <Messages/PartyKickRequest.h>
#include <Messages/NotifyPlayerJoined.h>

#include <Setting.h>
namespace
{
Console::Setting bAutoPartyJoin{"Gameplay:bAutoPartyJoin", "Join parties automatically, as long as there is only one party in the server", true};
}

PartyService::PartyService(World& aWorld, entt::dispatcher& aDispatcher) noexcept
: m_world(aWorld)
, m_updateEvent(aDispatcher.sink<UpdateEvent>().connect<&PartyService::OnUpdate>(this))
Expand Down Expand Up @@ -122,7 +116,7 @@ void PartyService::OnPartyCreate(const PacketEvent<PartyCreateRequest>& acPacket
spdlog::debug("[PartyService]: Created party for {}", player->GetId());
SendPartyJoinedEvent(party, player);

if (m_parties.size() == 1 && bAutoPartyJoin)
if (m_parties.size() == 1 && GameServer::Get()->AllowsAutoPartyJoin())
{
for (Player* otherPlayer : m_world.GetPlayerManager())
{
Expand Down Expand Up @@ -218,7 +212,7 @@ void PartyService::OnPlayerJoin(const PlayerJoinEvent& acEvent) noexcept

GameServer::Get()->SendToPlayers(notify, acEvent.pPlayer);

if (m_parties.size() == 1 && bAutoPartyJoin)
if (m_parties.size() == 1 && GameServer::Get()->AllowsAutoPartyJoin())
{
for (Player* player : m_world.GetPlayerManager())
{
Expand Down
Loading