@@ -13,7 +13,7 @@ struct CharacterTemplate {
13
13
fn despawn_dead_enemies ( mut commands : Commands , enemies : Query < ( Entity , & Enemy ) > ) {
14
14
for ( entity, enemy) in enemies. iter ( ) {
15
15
if enemy. hit_points == 0 {
16
- commands. despawn_recursive ( entity) ;
16
+ commands. entity ( entity) . despawn_recursive ( ) ;
17
17
}
18
18
}
19
19
}
@@ -25,9 +25,9 @@ fn hurt_enemies(mut enemies: Query<&mut Enemy>) {
25
25
}
26
26
27
27
fn spawn_enemy ( mut commands : Commands , character_template : Res < CharacterTemplate > ) {
28
- commands. spawn ( ( Enemy {
28
+ commands. spawn ( ) . insert ( Enemy {
29
29
hit_points : * character_template. hit_points . get ( "enemy" ) . unwrap ( ) ,
30
- } , ) ) ;
30
+ } ) ;
31
31
}
32
32
33
33
#[ test]
@@ -45,10 +45,7 @@ fn did_hurt_enemy() {
45
45
schedule. add_stage ( "update" , update_stage) ;
46
46
47
47
// Setup test entities
48
- let ennemy_id = commands
49
- . spawn ( ( Enemy { hit_points : 5 } , ) )
50
- . current_entity ( )
51
- . unwrap ( ) ;
48
+ let ennemy_id = commands. spawn ( ) . insert ( Enemy { hit_points : 5 } ) . id ( ) ;
52
49
queue. apply ( & mut world) ;
53
50
54
51
// Run systems
@@ -74,10 +71,7 @@ fn did_despawn_enemy() {
74
71
schedule. add_stage ( "update" , update_stage) ;
75
72
76
73
// Setup test entities
77
- let ennemy_id = commands
78
- . spawn ( ( Enemy { hit_points : 1 } , ) )
79
- . current_entity ( )
80
- . unwrap ( ) ;
74
+ let ennemy_id = commands. spawn ( ) . insert ( Enemy { hit_points : 1 } ) . id ( ) ;
81
75
queue. apply ( & mut world) ;
82
76
83
77
// Run systems
0 commit comments