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

(7ee8dbc11) v0.9.8.0

Browse Source
This commit is contained in:
Joonas Rikkonen
2020-03-31 15:11:41 +03:00
parent 3e99a49383
commit b647059b93
147 changed files with 2299 additions and 1297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Networking/Client.cs
+31 -3
View File
@@ -21,16 +21,27 @@ namespace Barotrauma.Networking
private Character character;
public Character Character
{
get { return character; }
get
{
if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient && (character?.ID ?? 0) != CharacterID)
{
Character = Entity.FindEntityByID(CharacterID) as Character;
}
return character;
}
set
{
if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer)
{
GameMain.NetworkMember.LastClientListUpdateID++;
if (value != null)
{
CharacterID = value.ID;
}
}
else
{
if (value!=null)
if (value != null)
{
DebugConsole.NewMessage(value.Name, Microsoft.Xna.Framework.Color.Yellow);
}
@@ -52,6 +63,8 @@ namespace Barotrauma.Networking
}
}
public UInt16 CharacterID;
private Vector2 spectate_position;
public Vector2? SpectatePos
{
@@ -98,7 +111,22 @@ namespace Barotrauma.Networking
private set;
}
public bool InGame;
private bool inGame;
public bool InGame
{
get
{
return inGame;
}
set
{
if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer)
{
GameMain.NetworkMember.LastClientListUpdateID++;
}
inGame = value;
}
}
public bool HasSpawned; //has the client spawned as a character during the current round
private List<Client> kickVoters;