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

Fixed characters occasionally teleporting around at the clients' end after respawning. The position syncing logic assumed that all coordinates above the level are in sub-relative space, even though the world position of the respawn shuttle can also be above the level.

Browse Source
This commit is contained in:
Regalis
2017-04-17 17:56:17 +03:00
parent 8964c0df5c
commit b24f0877a1
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Animation/Ragdoll.cs
+13 -7
View File
@@ -1234,19 +1234,21 @@ namespace Barotrauma
{ {
if (GameMain.NetworkMember == null) return; if (GameMain.NetworkMember == null) return;
float lowestSubPos = ConvertUnits.ToSimUnits(Submarine.Loaded.Min(s => s.HiddenSubPosition.Y - s.Borders.Height));
for (int i = 0; i < character.MemState.Count; i++ ) for (int i = 0; i < character.MemState.Count; i++ )
{ {
if (character.Submarine == null) if (character.Submarine == null)
{ {
//transform in-sub coordinates to outside coordinates //transform in-sub coordinates to outside coordinates
if (character.MemState[i].Position.Y > ConvertUnits.ToSimUnits(Level.Loaded.Size.Y)) if (character.MemState[i].Position.Y > lowestSubPos)
character.MemState[i].TransformInToOutside(); character.MemState[i].TransformInToOutside();
} }
else if (currentHull != null) else if (currentHull != null)
{ {
//transform outside coordinates to in-sub coordinates //transform outside coordinates to in-sub coordinates
if (character.MemState[i].Position.Y < ConvertUnits.ToSimUnits(Level.Loaded.Size.Y)) if (character.MemState[i].Position.Y <lowestSubPos)
character.MemState[i].TransformOutToInside(currentHull.Submarine); character.MemState[i].TransformOutToInside(currentHull.Submarine);
} }
} }
@@ -1307,20 +1309,24 @@ namespace Barotrauma
//remove states with a timestamp (there may still timestamp-based states //remove states with a timestamp (there may still timestamp-based states
//in the list if the controlled character switches from timestamp-based interpolation to ID-based) //in the list if the controlled character switches from timestamp-based interpolation to ID-based)
character.MemState.RemoveAll(m => m.Timestamp > 0.0f); character.MemState.RemoveAll(m => m.Timestamp > 0.0f);
for (int i = 0; i < character.MemLocalState.Count; i++) for (int i = 0; i < character.MemLocalState.Count; i++)
{ {
if (character.Submarine == null) if (character.Submarine == null)
{ {
//transform in-sub coordinates to outside coordinates //transform in-sub coordinates to outside coordinates
if (character.MemLocalState[i].Position.Y > ConvertUnits.ToSimUnits(Level.Loaded.Size.Y)) if (character.MemLocalState[i].Position.Y > lowestSubPos)
{
character.MemLocalState[i].TransformInToOutside(); character.MemLocalState[i].TransformInToOutside();
}
} }
else if (currentHull != null) else if (currentHull != null)
{ {
//transform outside coordinates to in-sub coordinates //transform outside coordinates to in-sub coordinates
if (character.MemLocalState[i].Position.Y < ConvertUnits.ToSimUnits(Level.Loaded.Size.Y)) if (character.MemLocalState[i].Position.Y < lowestSubPos)
character.MemLocalState[i].TransformOutToInside(currentHull.Submarine); {
character.MemLocalState[i].TransformOutToInside(currentHull.Submarine);
}
} }
} }