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

Server doesn't trust client positions

Browse Source 
Client doesn't receive its own real position from the server yet (and I actually can't find where the code filters this information out, but since I'm doing a rewrite it probably won't matter), and since the inputs aren't sent reliably or redundantly, desync is inevitable.
This commit is contained in:
juanjp600
2016-08-25 19:15:10 -03:00
parent 12f849be01
commit a00ceb5b9f
1 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Character.cs
+36 -27
View File
@@ -1565,14 +1565,17 @@ namespace Barotrauma
message.Write(AnimController.Dir > 0.0f); message.Write(AnimController.Dir > 0.0f);
} }
message.Write(Submarine != null); if (GameMain.Server != null)
{
message.Write(Submarine != null);
//Vector2 position = Submarine == null ? SimPosition : SimPosition - Submarine.SimPosition; //Vector2 position = Submarine == null ? SimPosition : SimPosition - Submarine.SimPosition;
//if ((AnimController.RefLimb.SimPosition - Submarine.Loaded.SimPosition).Length() > NetConfig.CharacterIgnoreDistance) return true; //if ((AnimController.RefLimb.SimPosition - Submarine.Loaded.SimPosition).Length() > NetConfig.CharacterIgnoreDistance) return true;
message.Write(SimPosition.X); message.Write(SimPosition.X);
message.Write(SimPosition.Y); message.Write(SimPosition.Y);
}
networkUpdateSent = true; networkUpdateSent = true;
@@ -1811,31 +1814,34 @@ namespace Barotrauma
return false; return false;
} }
bool inSub = message.ReadBoolean(); if (GameMain.Server == null)
pos.X = message.ReadFloat();
pos.Y = message.ReadFloat();
if (inSub != (Submarine != null))
{ {
AnimController.Teleport(pos - SimPosition, Vector2.Zero); bool inSub = message.ReadBoolean();
}
if (inSub) pos.X = message.ReadFloat();
{ pos.Y = message.ReadFloat();
//AnimController.FindHull(ConvertUnits.ToDisplayUnits(pos) - Submarine.Loaded.WorldPosition);
Hull newHull = Hull.FindHull(ConvertUnits.ToDisplayUnits(pos), AnimController.CurrentHull, false); if (inSub != (Submarine != null))
if (newHull != null)
{ {
AnimController.CurrentHull = newHull; AnimController.Teleport(pos - SimPosition, Vector2.Zero);
Submarine = newHull.Submarine; }
if (inSub)
{
//AnimController.FindHull(ConvertUnits.ToDisplayUnits(pos) - Submarine.Loaded.WorldPosition);
Hull newHull = Hull.FindHull(ConvertUnits.ToDisplayUnits(pos), AnimController.CurrentHull, false);
if (newHull != null)
{
AnimController.CurrentHull = newHull;
Submarine = newHull.Submarine;
}
}
else
{
AnimController.CurrentHull = null;
Submarine = null;
} }
}
else
{
AnimController.CurrentHull = null;
Submarine = null;
} }
if (secondaryKeyState) if (secondaryKeyState)
@@ -1853,8 +1859,11 @@ namespace Barotrauma
AnimController.TargetDir = dir < 0 ? Direction.Left : Direction.Right; AnimController.TargetDir = dir < 0 ? Direction.Left : Direction.Right;
} }
AnimController.RefLimb.body.TargetPosition = if (GameMain.Server == null)
AnimController.EstimateCurrPosition(pos, (float)(NetTime.Now) - sendingTime); {
AnimController.RefLimb.body.TargetPosition =
AnimController.EstimateCurrPosition(pos, (float)(NetTime.Now) - sendingTime);
}
LastNetworkUpdate = sendingTime; LastNetworkUpdate = sendingTime;