Merge branch 'main' into purchase

This commit is contained in:
Master 2023-06-05 05:38:05 +08:00 committed by GitHub
commit 27ed19bd04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions

View File

@ -1,5 +1,3 @@
import { RequestHandler } from "express";
import { Account } from "@/src/models/loginModel"; import { Account } from "@/src/models/loginModel";
import { Ship } from "@/src/models/shipModel"; import { Ship } from "@/src/models/shipModel";
@ -21,13 +19,6 @@ const getShipController: RequestHandler = async (_req, res) => {
return; return;
} }
} }
if (ship) {
const new_ship = ship;
if (config.testMission) new_ship.Ship.Features = testShipFeature;
res.json(new_ship);
return;
}
res.json(ship); res.json(ship);
}; };