vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Readded team assignment logic

Browse Source
This commit is contained in:
Regalis
2017-01-15 20:39:06 +02:00
parent b0231105a2
commit e27fa1c7ee
2 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Subsurface/Source/Characters/Character.cs
View File

@@ -2410,16 +2410,18 @@ namespace Barotrauma
//character with no characterinfo (e.g. some monster)
if (Info == null) return;
Client ownerClient = GameMain.Server.ConnectedClients.Find(c => c.Character == this);
Client ownerClient = GameMain.Server.ConnectedClients.Find(c => c.Character == this);
if (ownerClient != null)
{
msg.Write(true);
msg.Write(ownerClient.ID);
msg.Write(TeamID);
}
else if (GameMain.Server.Character == this)
{
msg.Write(true);
msg.Write((byte)0);
msg.Write(TeamID);
}
else
{
@@ -2461,6 +2463,7 @@ namespace Barotrauma
{
bool hasOwner = inc.ReadBoolean();
int ownerId = hasOwner ? inc.ReadByte() : -1;
byte teamID = hasOwner ? inc.ReadByte() : (byte)0;
string newName = inc.ReadString();
@@ -2478,6 +2481,7 @@ namespace Barotrauma
character = Character.Create(configPath, position, ch, GameMain.Client.ID != ownerId, hasAi);
character.ID = id;
character.TeamID = teamID;
if (GameMain.Client.ID == ownerId)
{