(4ca668169) Fixed: Conflict

Barotrauma/BarotraumaShared/Source/Map/Levels/LevelObjects/LevelObject.cs

@@ -20,6 +20,8 @@ namespace Barotrauma
 
         public float Rotation;
 
+        private int spriteIndex;
+
         public LevelObjectPrefab ActivePrefab;
 
         public PhysicsBody PhysicsBody
@@ -40,6 +42,15 @@ namespace Barotrauma
             set { Triggers.ForEach(t => t.NeedsNetworkSyncing = false); }
         }
 
+        public Sprite Sprite
+        {
+            get { return spriteIndex < 0 || Prefab.Sprites.Count == 0 ? null : Prefab.Sprites[spriteIndex % Prefab.Sprites.Count]; }
+        }
+        public Sprite SpecularSprite
+        {
+            get { return spriteIndex < 0 || Prefab.SpecularSprites.Count == 0 ? null : Prefab.SpecularSprites[spriteIndex % Prefab.SpecularSprites.Count]; }
+        }
+
         public LevelObject(LevelObjectPrefab prefab, Vector3 position, float scale, float rotation = 0.0f)
         {
             Triggers = new List<LevelTrigger>();
@@ -49,6 +60,8 @@ namespace Barotrauma
             Scale = scale;
             Rotation = rotation;
 
+            spriteIndex = ActivePrefab.Sprites.Any() ? Rand.Int(ActivePrefab.Sprites.Count, Rand.RandSync.Server) : -1;
+
             if (prefab.PhysicsBodyElement != null)
             {
                 PhysicsBody = new PhysicsBody(prefab.PhysicsBodyElement, ConvertUnits.ToSimUnits(new Vector2(position.X, position.Y)), Scale);