Fixed parrot

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java

@@ -93,23 +93,26 @@ public class ModelFactory {
         Group boatAssets = new Group();
         MeshView hull = importBoatSTL(boatType.hullFile);
         hull.setMaterial(new PhongMaterial(primaryColour));
-        MeshView sail = importBoatSTL(boatType.sailFile);
+        boatAssets.getChildren().add(hull);
-        sail.setMaterial(
-            new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.BLACK : Color.WHITE)
-        );
-
-        boatAssets.getChildren().addAll(hull, sail);
 
         if (boatType.mastFile != null) {
             MeshView mast = importBoatSTL(boatType.mastFile);
             mast.setMaterial(new PhongMaterial(primaryColour));
             boatAssets.getChildren().add(mast);
+        } else {
+            boatAssets.getChildren().add(new Group());
         }
 
+        MeshView sail = importBoatSTL(boatType.sailFile);
+        sail.setMaterial(
+            new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.DARKGRAY : Color.WHITE)
+        );
+        boatAssets.getChildren().add(sail);
+
         if (boatType.jibFile != null) {
             MeshView jib = importBoatSTL(boatType.jibFile);
-            sail.setMaterial(
+            jib.setMaterial(
-                new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.DARKGRAY : Color.WHITE)
+                new PhongMaterial(boatType == BoatMeshType.PARROT ? Color.BLACK : Color.WHITE)
             );
             boatAssets.getChildren().add(jib);
         }