(9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time.

2019-04-04 11:08:18 +03:00
parent 7491b06a5d
commit d4752bb6a0
56 changed files with 854 additions and 572 deletions
@@ -210,13 +210,8 @@ namespace Barotrauma.Items.Components
            {
                Entity.Spawner.AddToSpawnQueue(fabricatedItem.TargetItem, outputContainer.Inventory, fabricatedItem.TargetItem.Health * fabricatedItem.OutCondition);
            }
-
-            bool isNotClient = true;
-#if CLIENT
-            isNotClient = GameMain.Client == null;
-#endif
-
-            if (isNotClient && user != null)
+            
+            if ((GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer) && user != null && !user.Removed)
            {
                foreach (Skill skill in fabricatedItem.RequiredSkills)
                {