Merge pull request #88 from bananu7/dont-allow-attack-self

Dont allow attack self

packages/server/src/game/command.ts

@@ -72,6 +72,9 @@ export const attackCommand = (ctx: CommandContext, cmd: CommandAttack) =>  {
         throw new ComponentMissingError("Attacker");
     }
 
+    if (ctx.unit.id === cmd.target)
+        throw new InvalidCommandError("Unit tried to attack itself");
+
     // target not existing is a common situation if the target got destroyed
     // after the command was made
     const target = g.units.find(u => u.id === cmd.target);

packages/server/test/behaviour.test.ts

@@ -155,6 +155,26 @@ test('attack-move action', () => {
     expect(game.units[0].state.action).toBe('Attacking');
 });
 
+describe('attack action', () => {
+    test("don't allow targetting self", () => {
+        const game = createBasicGame({});
+        spawnUnit(game, 1, "Trooper", {x: 4, y: 10});
+
+        command({
+                command: { typ: 'Attack', target: 1, },
+                unitIds: [1],
+                shift: false,
+            },
+            game,
+            1
+        );
+        tick(TICK_MS, game);
+
+        expect(game.units[0].state.state).toBe('idle');
+        expect(game.units[0].state.action).toBe('Idle');
+    });
+})
+
 describe('produce action', () => {
     test('ensure resources', () => {
         const game = createBasicGame({});