revert(Game): revert revision at Game.AddShip

asdawej · Dec 23, 2023 · 73d38dc · 73d38dc
1 parent 7e5743a
commit 73d38dc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/logic/Gaming/Game.cs b/logic/Gaming/Game.cs
@@ -32,7 +32,7 @@ public long AddShip(ShipInitInfo shipInitInfo)
             bool validBirthPoint = false;
             foreach (XY birthPoint in teamList[(int)shipInitInfo.teamID].BirthPointList)
             {
-                if (GameData.ApproachToInteract(GameData.PosGridToCellXY(pos), birthPoint) && GameData.PosGridToCellXY(pos) != birthPoint)
+                if (GameData.ApproachToInteract(pos, birthPoint) && pos != birthPoint)
                 {
                     validBirthPoint = true;
                     break;

diff --git a/logic/Server/RpcServices.cs b/logic/Server/RpcServices.cs
@@ -119,10 +119,8 @@ public override async Task AddPlayer(PlayerMsg request, IServerStreamWriter<Mess
 
             lock (addPlayerLock)
             {
-                // ShipInitInfo?
                 XY birthPoint = new(request.X, request.Y);
                 Game.ShipInitInfo playerInitInfo = new(request.TeamId, request.PlayerId, birthPoint, Transformation.ShipTypeFromProto(request.ShipType));
-                // AddShip?
                 long newPlayerID = game.AddShip(playerInitInfo);
                 if (newPlayerID == GameObj.invalidID)
                     return;