Pavel_Sorokin/PIbd-21_Sorokin_P.V._Liner._Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sorokin_P.V. Lab Work 8 #8

Closed
Pavel_Sorokin wants to merge 9 commits from LabWork08 into LabWork07
pull from: LabWork08
merge into: Pavel_Sorokin:LabWork07
Conversation 0 Commits 9 Files Changed 9 +9 -2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3c14b35930 - Show all commits

11
Liner/Liner/DrawingObjectShip.cs
View File

@ -36,13 +36,18 @@ namespace Liner
public bool Equals(IDrawingObject? other)
{
if (other is not DrawingObjectShip otherShip)
if (other == null)
{
return false;
}
var otherShip = other as DrawingObjectShip;
if (otherShip == null)
{
return false;
}
var ship = _ship.Ship;
var otherShipShip = otherShip._ship.Ship;
if (ship.GetType() != otherShipShip.GetType())
if (ship.GetType().Name != otherShipShip.GetType().Name)
{
return false;
}
@ -76,4 +81,6 @@ namespace Liner
return true;
}
}
}
}