Merge branch 'master' into new-netcode
Conflicts: Subsurface/Properties/AssemblyInfo.cs Subsurface/Source/Items/Components/Signal/Wire.cs Subsurface/Source/Items/Item.cs Subsurface/Source/Items/ItemInventory.cs Subsurface/Source/Networking/GameServer.cs
This commit is contained in:
@@ -333,6 +333,11 @@ namespace Barotrauma
|
||||
|
||||
public void SetTransform(Vector2 position, float rotation)
|
||||
{
|
||||
System.Diagnostics.Debug.Assert(MathUtils.IsValid(position));
|
||||
System.Diagnostics.Debug.Assert(Math.Abs(position.X) < 1000000.0f);
|
||||
System.Diagnostics.Debug.Assert(Math.Abs(position.Y) < 1000000.0f);
|
||||
|
||||
|
||||
body.SetTransform(position, rotation);
|
||||
SetPrevTransform(position, rotation);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user