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

Add player addon checker

Browse Source
This commit is contained in:
Benau 2019-12-03 15:32:06 +08:00
parent ddbdf2d244
commit f470ab7f44
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@
#include "network/protocols/server_lobby.hpp"
#include "addons/addon.hpp"
#include "config/user_config.hpp"
#include "items/network_item_manager.hpp"
#include "items/powerup_manager.hpp"
@ -4942,6 +4943,63 @@ void ServerLobby::handleServerCommand(Event* event, STKPeer* peer) const
peer->sendPacket(chat, true/*reliable*/);
delete chat;
}
else if (StringUtils::startsWith(cmd, "playerhasaddon"))
{
NetworkString* chat = getNetworkString();
chat->addUInt8(LE_CHAT);
chat->setSynchronous(true);
std::string part;
if (cmd.length() > 15)
part = cmd.substr(15);
std::string addon_id = part.substr(0, part.find(' '));
std::string player_name;
if (part.length() > addon_id.length() + 1)
player_name = part.substr(addon_id.length() + 1);
std::shared_ptr<STKPeer> player_peer = STKHost::get()->findPeerByName(
StringUtils::utf8ToWide(player_name));
if (player_name.empty() || !player_peer || addon_id.empty())
{
chat->encodeString16(
L"Usage: /playerhasaddon [addon_identity] [player name]");
}
else
{
std::string addon_id_test = Addon::createAddonId(addon_id);
bool found = false;
const auto& kt = player_peer->getClientAssets();
for (auto& kart : kt.first)
{
if (kart == addon_id_test)
{
found = true;
break;
}
}
if (!found)
{
for (auto& track : kt.second)
{
if (track == addon_id_test)
{
found = true;
break;
}
}
}
if (found)
{
chat->encodeString16(StringUtils::utf8ToWide
(player_name + " has addon " + addon_id));
}
else
{
chat->encodeString16(StringUtils::utf8ToWide
(player_name + " has no addon " + addon_id));
}
}
peer->sendPacket(chat, true/*reliable*/);
delete chat;
}
else
{
NetworkString* chat = getNetworkString();

4
src/network/stk_peer.hpp
View File

@ -158,7 +158,7 @@ public:
{ m_available_kts = std::make_pair(std::move(k), std::move(t)); }
// ------------------------------------------------------------------------
void eraseServerKarts(const std::set<std::string>& server_karts,
std::set<std::string>& karts_erase)
std::set<std::string>& karts_erase) const
{
if (m_available_kts.first.empty())
return;
@ -173,7 +173,7 @@ public:
}
// ------------------------------------------------------------------------
void eraseServerTracks(const std::set<std::string>& server_tracks,
std::set<std::string>& tracks_erase)
std::set<std::string>& tracks_erase) const
{
if (m_available_kts.second.empty())
return;