sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disallow kicking from within a game.

Browse Source
This commit is contained in:
lotodore
2008-11-10 23:06:24 +00:00
parent 66a7afee3d
commit 4ba76e60dd
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/servergamestate.cpp
+14 -2
View File
@@ -186,8 +186,9 @@ AbstractServerGameStateReceiving::Process(ServerGameThread &server)
} }
else if (packet->ToNetPacketKickPlayer()) else if (packet->ToNetPacketKickPlayer())
{ {
// Only admins are allowed to kick. // Only admins are allowed to kick, and only in the lobby.
if (session.playerData->GetRights() == PLAYER_RIGHTS_ADMIN) // After leaving the lobby, a vote needs to be initiated to kick.
if (session.playerData->GetRights() == PLAYER_RIGHTS_ADMIN && !server.IsRunning())
{ {
NetPacketKickPlayer::Data kickPlayerData; NetPacketKickPlayer::Data kickPlayerData;
packet->ToNetPacketKickPlayer()->GetData(kickPlayerData); packet->ToNetPacketKickPlayer()->GetData(kickPlayerData);
@@ -195,6 +196,17 @@ AbstractServerGameStateReceiving::Process(ServerGameThread &server)
server.InternalKickPlayer(kickPlayerData.playerId); server.InternalKickPlayer(kickPlayerData.playerId);
} }
} }
else if (packet->ToNetPacketAskKickPlayer())
{
if (server.IsRunning())
{
NetPacketAskKickPlayer::Data askKickData;
packet->ToNetPacketAskKickPlayer()->GetData(askKickData);
// TODO start vote kick.
//askKickData.playerId
}
}
// Chat text is always allowed. // Chat text is always allowed.
else if (packet->ToNetPacketSendChatText()) else if (packet->ToNetPacketSendChatText())
{ {