ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add kick player command

Browse Source
This commit is contained in:
Benau 2019-12-06 12:35:45 +08:00
parent 2cbf6b732e
commit 06b11056c8
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/network/protocols/server_lobby.cpp
View File

@ -793,7 +793,7 @@ bool ServerLobby::notifyEventAsynchronous(Event* event)
case LE_ASSETS_UPDATE:
handleAssets(event->data(), event->getPeer()); break;
case LE_COMMAND:
handleServerCommand(event, event->getPeer()); break;
handleServerCommand(event, event->getPeerSP()); break;
default: break;
} // switch
} // if (event->getType() == EVENT_TYPE_MESSAGE)
@ -4953,7 +4953,8 @@ bool ServerLobby::checkPeersReady(bool ignore_ai_peer) const
} // checkPeersReady
//-----------------------------------------------------------------------------
void ServerLobby::handleServerCommand(Event* event, STKPeer* peer) const
void ServerLobby::handleServerCommand(Event* event,
std::shared_ptr<STKPeer> peer) const
{
NetworkString& data = event->data();
std::string language;
@ -5059,6 +5060,38 @@ void ServerLobby::handleServerCommand(Event* event, STKPeer* peer) const
peer->sendPacket(chat, true/*reliable*/);
delete chat;
}
else if (StringUtils::startsWith(cmd, "kick"))
{
if (m_server_owner.lock() != peer)
{
NetworkString* chat = getNetworkString();
chat->addUInt8(LE_CHAT);
chat->setSynchronous(true);
chat->encodeString16(L"You are not server owner");
peer->sendPacket(chat, true/*reliable*/);
delete chat;
return;
}
std::string player_name;
if (cmd.length() > 5)
player_name = cmd.substr(5);
std::shared_ptr<STKPeer> player_peer = STKHost::get()->findPeerByName(
StringUtils::utf8ToWide(player_name));
if (player_name.empty() || !player_peer || player_peer->isAIPeer())
{
NetworkString* chat = getNetworkString();
chat->addUInt8(LE_CHAT);
chat->setSynchronous(true);
chat->encodeString16(
L"Usage: /kick [player name]");
peer->sendPacket(chat, true/*reliable*/);
delete chat;
}
else
{
player_peer->kick();
}
}
else if (StringUtils::startsWith(cmd, "playeraddonscore"))
{
NetworkString* chat = getNetworkString();

2
src/network/protocols/server_lobby.hpp
View File

@ -331,7 +331,7 @@ private:
std::vector<std::shared_ptr<NetworkPlayerProfile> > getLivePlayers() const;
void setPlayerKarts(const NetworkString& ns, STKPeer* peer) const;
bool handleAssets(const NetworkString& ns, STKPeer* peer) const;
void handleServerCommand(Event* event, STKPeer* peer) const;
void handleServerCommand(Event* event, std::shared_ptr<STKPeer> peer) const;
void liveJoinRequest(Event* event);
void rejectLiveJoin(STKPeer* peer, BackLobbyReason blr);
bool canLiveJoinNow() const;