chore: resolved merge conflicts

pull/89/head
alestiago 4 years ago
parent ae27a86eb0
commit ad44848ba2

@ -5,7 +5,6 @@ export 'board_side.dart';
export 'bonus_word.dart';
export 'flipper.dart';
export 'flutter_forest.dart';
export 'initial_position.dart';
export 'jetpack_ramp.dart';
export 'joint_anchor.dart';
export 'kicker.dart';

@ -3,7 +3,9 @@
import 'package:flame/components.dart';
import 'package:flame_bloc/flame_bloc.dart';
import 'package:flame_forge2d/flame_forge2d.dart';
import 'package:pinball/flame/blueprint.dart';
import 'package:pinball/game/game.dart';
import 'package:pinball_components/pinball_components.dart';
/// {@template flutter_forest}
/// Area positioned at the top right of the [Board] where the [Ball]
@ -33,7 +35,7 @@ class FlutterForest extends Component
@override
void onNewState(GameState state) {
super.onNewState(state);
gameRef.add(Ball()..initialPosition = position);
gameRef.addFromBlueprint(BallBlueprint(position: position));
}
@override

Loading…
Cancel
Save