michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into Story71_TackAndGybeSmoothly

Browse Source
This commit is contained in:
Alistair McIntyre
2017-08-10 17:59:19 +12:00
parent a23352ef85
commit a2ee4411be
6 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/model/mark/CompoundMark.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class CompoundMark {
public CompoundMark(int markID, String name, List<Mark> marks) {
this.compoundMarkId = markID;
this.name = name;
this.name = name;
this.marks.addAll(marks);
if (marks.size() > 1) {
this.midPoint = GeoUtility.getDirtyMidPoint(marks.get(0), marks.get(1));