Unstable 0.1400.7.0 (Coronavirus edition)

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Throwable.cs

@@ -12,6 +12,9 @@ namespace Barotrauma.Items.Components
 
         private bool midAir;
 
+        //continuous collision detection is used while the item is moving faster than this
+        const float ContinuousCollisionThreshold = 5.0f;
+
         public Character CurrentThrower
         {
             get;
@@ -61,6 +64,13 @@ namespace Barotrauma.Items.Components
             if (!item.body.Enabled) { return; }
             if (midAir)
             {
+                if (item.body.FarseerBody.IsBullet)
+                {
+                    if (item.body.LinearVelocity.LengthSquared() < ContinuousCollisionThreshold * ContinuousCollisionThreshold)
+                    {
+                        item.body.FarseerBody.IsBullet = false;
+                    }
+                }
                 if (item.body.LinearVelocity.LengthSquared() < 0.01f)
                 {
                     CurrentThrower = null;
@@ -156,6 +166,7 @@ namespace Barotrauma.Items.Components
 
                     //disable platform collisions until the item comes back to rest again
                     item.body.CollidesWith = Physics.CollisionWall | Physics.CollisionLevel;
+                    item.body.FarseerBody.IsBullet = true;
                     midAir = true;
 
                     ac.GetLimb(LimbType.Head).body.ApplyLinearImpulse(throwVector * 10.0f, maxVelocity: NetConfig.MaxPhysicsBodyVelocity);
@@ -165,6 +176,7 @@ namespace Barotrauma.Items.Components
                     item.body.AngularVelocity = rightHand.body.AngularVelocity;
                     throwPos = 0;
                     throwDone = true;
+                    IsActive = true;
 
                     if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer)
                     {