From beb7bdf5526564be101776c66b21587ae8bcecba Mon Sep 17 00:00:00 2001
From: Ctepa <CtepanCecevitcin@yandex.ru>
Date: Mon, 20 May 2024 04:55:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BB=D0=B5=D1=82=D0=B5=D0=B2=D1=88?=
 =?UTF-8?q?=D0=B0=D1=8F=207=20=D0=BB=D0=B0=D0=B1=D0=B0=20=D0=B3=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AntiAircraftGun/AntiAircraftGun.csproj    |  6 ++----
 .../AbstractCompany.cs                        |  7 +++++--
 .../GunSharingService.cs                      | 19 +++++++++++--------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj b/AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj
index 9e09dd0..a302ed7 100644
--- a/AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj
+++ b/AntiAircraftGun/AntiAircraftGun/AntiAircraftGun.csproj
@@ -13,11 +13,9 @@
     <PackageReference Include="EntityFramework.ru" Version="6.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/AbstractCompany.cs b/AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/AbstractCompany.cs
index b115d09..0e34fbc 100644
--- a/AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/AbstractCompany.cs
+++ b/AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/AbstractCompany.cs
@@ -86,8 +86,11 @@ public abstract class AbstractCompany
         SetObjectsPosition();
         for (int i = 0; i < (_collection?.Count ?? 0); ++i)
         {
-            DrawningGun? obj = _collection?.Get(i);
-            obj?.DrawTransport(graphics);
+            try
+            {
+                DrawningGun? obj = _collection?.Get(i);
+                obj?.DrawTransport(graphics);
+            }catch(Exception ) { }
         }
         return bitmap;
     }
diff --git a/AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/GunSharingService.cs b/AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/GunSharingService.cs
index 90f4428..5851c87 100644
--- a/AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/GunSharingService.cs
+++ b/AntiAircraftGun/AntiAircraftGun/CollectionGenericObjects/GunSharingService.cs
@@ -45,19 +45,22 @@ public class GunSharingService : AbstractCompany
         int boarderOffsetY = 10;
 
         int currentIndex = -1;
-
-        for (int j = 0; j < maxCountY; j++)
+        try
         {
-            for (int i = 0; i < maxCountX; i++) 
+            for (int j = 0; j < maxCountY; j++)
             {
-                currentIndex++;
-                if (_collection.Get(currentIndex) != null)
+                for (int i = 0; i < maxCountX; i++)
                 {
+                    currentIndex++;
+                    if (_collection.Get(currentIndex) != null)
+                    {
 
-                    _collection.Get(currentIndex).SetPictureSize(_pictureWidth, _pictureHeight);
-                    _collection.Get(currentIndex).SetPosition(boarderOffsetX + i * _placeSizeWidth + i * offsetX, boarderOffsetY + j * _placeSizeHeight);
+                        _collection.Get(currentIndex).SetPictureSize(_pictureWidth, _pictureHeight);
+                        _collection.Get(currentIndex).SetPosition(boarderOffsetX + i * _placeSizeWidth + i * offsetX, boarderOffsetY + j * _placeSizeHeight);
+                    }
                 }
             }
-        }
+        }catch (Exception ) { }
+        
     }
 }