Merge https://github.com/Regalis11/Barotrauma

2022-10-20 12:14:02 -03:00
parent 032572de52 a6ee9eadf3
commit 599db6be5e
63 changed files with 579 additions and 339 deletions
@@ -284,9 +284,10 @@ namespace Barotrauma.Items.Components
                {
                    Entity.Spawner.AddItemToSpawnQueue(itemPrefab, outputContainer.Inventory, condition, onSpawned: (Item spawnedItem) =>
                    {
-                        spawnedItem.SpawnedInCurrentOutpost = item.SpawnedInCurrentOutpost;
                        spawnedItem.StolenDuringRound = targetItem.StolenDuringRound;
                        spawnedItem.AllowStealing = targetItem.AllowStealing;
+                        spawnedItem.OriginalOutpost = targetItem.OriginalOutpost;
+                        spawnedItem.SpawnedInCurrentOutpost = targetItem.SpawnedInCurrentOutpost;
                        for (int i = 0; i < outputContainer.Capacity; i++)
                        {
                            var containedItem = outputContainer.Inventory.GetItemAt(i);
@@ -83,8 +83,16 @@ namespace Barotrauma.Items.Components
            {
                if (lastUser == value) { return; }
                lastUser = value;
-                degreeOfSuccess = lastUser == null ? 0.0f : Math.Min(DegreeOfSuccess(lastUser), 1.0f);
-                LastUserWasPlayer = lastUser.IsPlayer;
+                if (lastUser == null)
+                {
+                    degreeOfSuccess = 0.0f;
+                    LastUserWasPlayer = false;
+                }
+                else
+                {
+                    degreeOfSuccess = Math.Min(DegreeOfSuccess(lastUser), 1.0f);
+                    LastUserWasPlayer = lastUser.IsPlayer;
+                }
            }
        }