diff --git a/lib/game/components/sparky_fire_zone.dart b/lib/game/components/sparky_fire_zone.dart index 0573f976..ea6442a8 100644 --- a/lib/game/components/sparky_fire_zone.dart +++ b/lib/game/components/sparky_fire_zone.dart @@ -1,8 +1,6 @@ // ignore_for_file: avoid_renaming_method_parameters import 'package:flame/components.dart'; -import 'package:flame_forge2d/flame_forge2d.dart'; -import 'package:flutter/material.dart'; import 'package:pinball/flame/flame.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; @@ -41,16 +39,3 @@ class _SparkyBumperController extends ComponentController isActivated = !isActivated; } } - -/// Listens when a [Ball] bounces bounces against a [SparkyBumper]. -class ControlledSparkyBumperBallContactCallback - extends ContactCallback, Ball> { - @override - void begin( - Controls<_SparkyBumperController> controlledSparkyBumper, - Ball _, - Contact __, - ) { - controlledSparkyBumper.controller.hit(); - } -} diff --git a/test/game/components/sparky_fire_zone_test.dart b/test/game/components/sparky_fire_zone_test.dart index b59e4a55..90bf874c 100644 --- a/test/game/components/sparky_fire_zone_test.dart +++ b/test/game/components/sparky_fire_zone_test.dart @@ -24,14 +24,7 @@ void main() { controlledSparkyBumper = ControlledSparkyBumper(); await game.ensureAdd(controlledSparkyBumper); - final callback = ControlledSparkyBumperBallContactCallback(); - game.addContactCallback(callback); - - callback.begin( - controlledSparkyBumper, - MockBall(), - MockContact(), - ); + controlledSparkyBumper.controller.hit(); }, verify: (game, tester) async { expect(controlledSparkyBumper.controller.isActivated, isTrue); @@ -44,19 +37,8 @@ void main() { controlledSparkyBumper = ControlledSparkyBumper(); await game.ensureAdd(controlledSparkyBumper); - final callback = ControlledSparkyBumperBallContactCallback(); - game.addContactCallback(callback); - - callback.begin( - controlledSparkyBumper, - MockBall(), - MockContact(), - ); - callback.begin( - controlledSparkyBumper, - MockBall(), - MockContact(), - ); + controlledSparkyBumper.controller.hit(); + controlledSparkyBumper.controller.hit(); }, verify: (game, tester) async { expect(controlledSparkyBumper.controller.isActivated, isFalse);