Merge pull request #653 from Mystic-Slice/RubbleHealthComponent

BenjaminAmos · web-flow · commit bc2a7b3308a1 · 2022-03-03T22:07:28.000Z
Rubble is mortal now!
diff --git a/engine/src/main/java/org/destinationsol/rubble/systems/RubbleCreationSystem.java b/engine/src/main/java/org/destinationsol/rubble/systems/RubbleCreationSystem.java
@@ -145,7 +145,8 @@ private void buildRubblePieces(Position pos, Velocity vel, Angle angle, Size siz
             velocityComponent.velocity = velocity;
 
             EntityRef entityRef = entitySystemManager.getEntityManager().createEntity(graphicsComponent, positionComponent,
-                    velocityComponent, angle, sizeComponent, new RubbleMesh());
+                    sizeComponent, angle, velocityComponent, new RubbleMesh(), health);
+
             SolMath.free(velocity);
             entityRef.setComponent(new BodyLinked());
         }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,8 @@ private void buildRubblePieces(Position pos, Velocity vel, Angle angle, Size siz`
`145`	`145`	`velocityComponent.velocity = velocity;`
`146`	`146`
`147`	`147`	`EntityRef entityRef = entitySystemManager.getEntityManager().createEntity(graphicsComponent, positionComponent,`
`148`		`- velocityComponent, angle, sizeComponent, new RubbleMesh());`
	`148`	`+ sizeComponent, angle, velocityComponent, new RubbleMesh(), health);`
	`149`	`+`
`149`	`150`	`SolMath.free(velocity);`
`150`	`151`	`entityRef.setComponent(new BodyLinked());`
`151`	`152`	`}`