From ee25905cc2955e1a80e41d630ad1a1c1207a5c45 Mon Sep 17 00:00:00 2001
From: Cat-pranks <Cat-pranks@DESKTOP-NTNPL1E>
Date: Wed, 6 Mar 2024 12:08:33 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=20re?=
 =?UTF-8?q?turn=20=D0=B2=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=20?=
 =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccordionBus/MovementStrategy/MoveToBorder.cs      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/AccordionBus/AccordionBus/MovementStrategy/MoveToBorder.cs b/AccordionBus/AccordionBus/MovementStrategy/MoveToBorder.cs
index cdb0963..3f23fb4 100644
--- a/AccordionBus/AccordionBus/MovementStrategy/MoveToBorder.cs
+++ b/AccordionBus/AccordionBus/MovementStrategy/MoveToBorder.cs
@@ -15,10 +15,8 @@ public class MoveToBorder : AbstractStategy
         {
             return false;
         }
-        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth
-        && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth &&
-        objParams.ObjectMiddleVertical - GetStep() <= FieldHeight
-        && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight;
+        return objParams.RightBorder <= FieldWidth && objParams.RightBorder + GetStep() >= FieldWidth &&
+        objParams.DownBorder <= FieldHeight && objParams.DownBorder + GetStep() >= FieldHeight;
     }
     protected override void MoveToTarget()
     {
@@ -30,7 +28,7 @@ public class MoveToBorder : AbstractStategy
         int diffX = objParams.ObjectMiddleHorizontal - FieldWidth;
         if (Math.Abs(diffX) > GetStep())
         {
-            if (diffX < 0)
+            if (diffX > 0)
             {
                 MoveLeft();
             }
@@ -42,7 +40,7 @@ public class MoveToBorder : AbstractStategy
         int diffY = objParams.ObjectMiddleVertical - FieldHeight;
         if (Math.Abs(diffY) > GetStep())
         {
-            if (diffY < 0)
+            if (diffY > 0)
             {
                 MoveUp();
             }