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

2024-06-19 12:45:44 -03:00
parent 91cc7dd1cd 85e5d806e6
commit f4219b0c75
12 changed files with 39 additions and 21 deletions
@@ -298,7 +298,7 @@ namespace Barotrauma

        public void PurchaseItems(Identifier storeIdentifier, List<PurchasedItem> itemsToPurchase, bool removeFromCrate, Client client = null)
        {
-            var store = Location.GetStore(storeIdentifier);
+            var store = Location?.GetStore(storeIdentifier);
            if (store == null) { return; }
            var itemsPurchasedFromStore = GetPurchasedItems(storeIdentifier, create: true);
            // Check all the prices before starting the transaction to make sure the modifiers stay the same for the whole transaction