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

Merge remote-tracking branch 'upstream/master' into develop

Browse Source
This commit is contained in:
EvilFactory
2024-04-24 12:20:11 -03:00
parent 10ad5d296e ff1b8951a7
commit 0a9ff43986
397 changed files with 15250 additions and 6473 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs
+26 -1
View File
@@ -75,7 +75,7 @@ namespace Barotrauma
NetConfig.HighPrioCharacterPositionUpdateInterval,
priority);
if (IsDead)
if (IsDead && !AnimController.IsDraggedWithRope)
{
interval = Math.Max(interval * 2, 0.1f);
}
@@ -594,6 +594,31 @@ namespace Barotrauma
}
}
break;
case LatchedOntoTargetEventData latchedOntoTargetEventData:
msg.WriteBoolean(latchedOntoTargetEventData.IsLatched);
if (latchedOntoTargetEventData.IsLatched)
{
msg.WriteSingle(SimPosition.X);
msg.WriteSingle(SimPosition.Y);
msg.WriteSingle(latchedOntoTargetEventData.AttachSurfaceNormal.X);
msg.WriteSingle(latchedOntoTargetEventData.AttachSurfaceNormal.Y);
msg.WriteSingle(latchedOntoTargetEventData.AttachPos.X);
msg.WriteSingle(latchedOntoTargetEventData.AttachPos.Y);
msg.WriteInt32(latchedOntoTargetEventData.TargetLevelWallIndex);
if (latchedOntoTargetEventData.TargetStructureID != NullEntityID)
{
msg.WriteUInt16(latchedOntoTargetEventData.TargetStructureID);
}
else if (latchedOntoTargetEventData.TargetCharacterID != NullEntityID)
{
msg.WriteUInt16(latchedOntoTargetEventData.TargetCharacterID);
}
else
{
msg.WriteUInt16(NullEntityID);
}
}
break;
default:
throw new Exception($"Malformed character event: did not expect {eventData.GetType().Name}");
}