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

2024-06-18 12:19:13 -03:00
parent 60d0a8d453 230d1b6e78
commit e163f7ed73
263 changed files with 7788 additions and 2849 deletions
@@ -296,7 +296,7 @@ namespace Barotrauma.Items.Components
            impactQueue.Clear();
            item.body.FarseerBody.OnCollision -= OnCollision;
            item.body.CollisionCategories = Physics.CollisionItem;
-            item.body.CollidesWith = Physics.CollisionWall;
+            item.body.CollidesWith = Physics.DefaultItemCollidesWith;
            item.body.FarseerBody.IsBullet = false;
            item.body.PhysEnabled = false;
        }