Skip to content

Multiplayer Kick function #231

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

Open
mccadecortez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Multiplayer Kick function #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions BG3Extender/Extender/Server/ServerNetworking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,22 @@ void NetworkManager::Send(net::ExtenderMessage * msg, UserId userId)
}
}

void NetworkManager::Kick(UserId userId, const char* kickText)
{
auto server = GetServer();

if (server != nullptr) {
auto kickMsg = GetFreeMessage();
auto kick = kickMsg->GetMessage().mutable_s2c_kick();

if (kickText != nullptr) {
kick->set_message(kickText);
}

server->SendMessageSingleRecipient(userId.Id, kickMsg);
}
}

void NetworkManager::Broadcast(net::ExtenderMessage * msg, UserId excludeUserId, bool excludeLocalPeer)
{
auto server = GetServer();
Expand Down
1 change: 1 addition & 0 deletions BG3Extender/Extender/Server/ServerNetworking.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class NetworkManager
net::GameServer* GetServer() const;

void Send(net::ExtenderMessage * msg, UserId userId);
void Kick(UserId userId, const char* kickText);
void Broadcast(net::ExtenderMessage * msg, UserId excludeUserId, bool excludeLocalPeer = false);
void BroadcastToConnectedPeers(net::ExtenderMessage* msg, UserId excludeUserId, bool excludeLocalPeer = false);

Expand Down
12 changes: 12 additions & 0 deletions BG3Extender/Lua/Libs/ServerNet.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@ std::optional<bool> PlayerHasExtender(lua_State* L, Guid characterGuid)
return networkMgr.CanSendExtenderMessages(character->UserID.GetPeerId());
}

void Kick(int userId, const char* kickText)
{
if (UserId(userId) == ReservedUserId) {
OsiError("Attempted to send message to reserved user ID!");
return;
}

auto& networkMgr = gExtender->GetServer().GetNetworkManager();
networkMgr.Kick(UserId(userId), kickText);
}

void RegisterNetLib()
{
DECLARE_MODULE(Net, Server)
Expand All @@ -75,6 +86,7 @@ void RegisterNetLib()
MODULE_FUNCTION(PostMessageToClient)
MODULE_FUNCTION(PostMessageToUser)
MODULE_FUNCTION(PlayerHasExtender)
MODULE_FUNCTION(Kick)
END_MODULE()
}

Expand Down