diff --git a/src/GameLogic/collisionManager.js b/src/GameLogic/collisionManager.js index eebd74c..949cd27 100644 --- a/src/GameLogic/collisionManager.js +++ b/src/GameLogic/collisionManager.js @@ -43,7 +43,7 @@ export class CollisionManager { } deleteFromAITank(tank) { - this._aiTanks = this._aiTanks.filter(t => tank.x != t.x && tank.y != t.y); + this._aiTanks = this._aiTanks.filter(t => tank.x != t.x || tank.y != t.y); } checkCollisionForTank(xMin, xMax, yMin, yMax, tank) { diff --git a/src/Tanks/aiTankManager.js b/src/Tanks/aiTankManager.js index 63606fb..1a0270d 100644 --- a/src/Tanks/aiTankManager.js +++ b/src/Tanks/aiTankManager.js @@ -47,7 +47,7 @@ export class AITankManager { } destroy(tank) { - this._activeTanks = this._activeTanks.filter(t => tank.x != t.x && tank.y != t.y); + this._activeTanks = this._activeTanks.filter(t => tank.x != t.x || tank.y != t.y); this._collision.deleteFromAITank(tank); this._canSpawn = true; } @@ -62,7 +62,7 @@ export class AITankManager { } isAllTanksDied() { - return this._count == 0; + return this._count == 0 && this._activeTanks.length == 0; } getCount() {