Unstable 0.1500.6.0 (1984 edition)

2021-10-09 00:22:02 +09:00
parent 08bdfc6cea
commit c8943ef9c4
96 changed files with 1817 additions and 559 deletions
@@ -83,7 +83,7 @@ namespace Barotrauma.Items.Components

        public void Draw(SpriteBatch spriteBatch, bool editing, float itemDepth = -1)
        {
-            if (target == null) { return; }
+            if (target == null || target.Removed) { return; }

            Vector2 startPos = GetSourcePos();
            startPos.Y = -startPos.Y;
@@ -103,7 +103,7 @@ namespace Barotrauma.Items.Components
                {
                    Vector2 barrelPos = FarseerPhysics.ConvertUnits.ToDisplayUnits(weapon.TransformedBarrelPos);
                    barrelPos.Y = -barrelPos.Y;
-                    startPos += barrelPos * item.Scale;
+                    startPos += barrelPos;
                }
            }
            Vector2 endPos = new Vector2(target.DrawPosition.X, target.DrawPosition.Y);