Readded voting (submarine, mode, end round & kick)

This commit is contained in:
Regalis
2017-02-04 16:44:46 +02:00
parent b5bac67c4a
commit 89e881cb57
9 changed files with 281 additions and 108 deletions

View File

@@ -2486,7 +2486,6 @@ namespace Barotrauma
{
if (GameMain.Server != null) return null;
bool noInfo = inc.ReadBoolean();
ushort id = inc.ReadUInt16();
string configPath = inc.ReadString();
@@ -2540,6 +2539,14 @@ namespace Barotrauma
character.memPos.Clear();
character.memLocalPos.Clear();
}
else
{
var ownerClient = GameMain.Client.ConnectedClients.Find(c => c.ID == ownerId);
if (ownerClient != null)
{
ownerClient.Character = character;
}
}
if (configPath == Character.HumanConfigFile)
{