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

2024-12-11 10:44:53 -03:00
parent b4f264df04 38ca721cb0
commit 6da26ffa93
257 changed files with 4793 additions and 1653 deletions
@@ -77,6 +77,9 @@ namespace Barotrauma.Items.Components

        public readonly ContentXElement originalElement;

+        /// <summary>
+        /// The default delay for delayed client-side corrections (see <see cref="StartDelayedCorrection"/>.
+        /// </summary>
        protected const float CorrectionDelay = 1.0f;
        protected CoroutineHandle delayedCorrectionCoroutine;

@@ -669,8 +672,7 @@ namespace Barotrauma.Items.Components
 #endif
        }
        
-        protected string GetTextureDirectory(ContentXElement subElement)
-            => subElement.DoesAttributeReferenceFileNameAlone("texture") ? Path.GetDirectoryName(item.Prefab.FilePath) : string.Empty;
+        protected string GetTextureDirectory(ContentXElement subElement) => item.Prefab.GetTexturePath(subElement, item.Prefab.ParentPrefab);

        public bool HasRequiredSkills(Character character)
        {