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

v1.4.4.1 (Blood in the Water Update)

Browse Source
This commit is contained in:
Regalis11
2024-04-24 18:09:05 +03:00
parent 89b91d1c3e
commit ff1b8951a7
397 changed files with 15250 additions and 6479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Barotrauma/BarotraumaServer/ServerSource/Networking/NetEntityEvent/ServerEntityEventManager.cs
View File

@@ -78,6 +78,11 @@ namespace Barotrauma.Networking
public bool IsProcessed;
/// <summary>
/// Does the client need to be controlling a character for the server to consider the event valid?
/// </summary>
public bool RequireCharacter = true;
public BufferedEvent(Client sender, Character senderCharacter, UInt16 characterStateID, IClientSerializable targetEntity, ReadWriteMessage data)
{
this.Sender = sender;
@@ -157,15 +162,19 @@ namespace Barotrauma.Networking
{
if (bufferedEvent.Character == null || bufferedEvent.Character.IsDead)
{
bufferedEvent.IsProcessed = true;
continue;
if (bufferedEvent.RequireCharacter)
{
bufferedEvent.IsProcessed = true;
continue;
}
}
//delay reading the events until the inputs for the corresponding frame have been processed
//UNLESS the character is unconscious, in which case we'll read the messages immediately (because further inputs will be ignored)
//atm the "give in" command is the only thing unconscious characters can do, other types of events are ignored
if (!bufferedEvent.Character.IsIncapacitated &&
if (bufferedEvent.Character != null &&
!bufferedEvent.Character.IsIncapacitated &&
NetIdUtils.IdMoreRecent(bufferedEvent.CharacterStateID, bufferedEvent.Character.LastProcessedID))
{
DebugConsole.Log($"Delaying reading entity event sent by a client until the character state has been processed. Event's character state: {bufferedEvent.CharacterStateID}, last processed character state: {bufferedEvent.Character.LastProcessedID}");
@@ -503,7 +512,12 @@ namespace Barotrauma.Networking
byte[] temp = msg.ReadBytes(msgLength - 2);
buffer.WriteBytes(temp, 0, msgLength - 2);
buffer.BitPosition = 0;
BufferEvent(new BufferedEvent(sender, sender.Character, characterStateID, entity, buffer));
BufferEvent(
new BufferedEvent(sender, sender.Character, characterStateID, entity, buffer)
{
//hull updates can be sent without a character to allow editing water and fire in spectator mode
RequireCharacter = entity is not Hull
});
sender.LastSentEntityEventID++;
}