Merge branch 'master' into wind_(story53)

racevisionGame/src/main/java/shared/model/CompoundMark.java

@@ -142,7 +142,7 @@ public class CompoundMark extends XMLCompoundMark{
 
     /**
      * Used to find how far apart the marks that make up this gate are
-     * If this compound mark is only one point return base length of 250m
+     * If this compound mark is only one point return base length of 400m
      * @return the acceptable distance to round a mark
      */
     public double getRoundingDistance(){
@@ -187,7 +187,7 @@ public class CompoundMark extends XMLCompoundMark{
         }
 
         //finds the mark furthest west and east
-        if(this.getMark1Position().getLatitude() > this.getMark2Position().getLatitude()){
+        if(this.getMark1Position().getLongitude() > this.getMark2Position().getLongitude()){
             westMostMark = this.mark1;
             eastMostMark = this.mark2;
         }else{
@@ -196,7 +196,7 @@ public class CompoundMark extends XMLCompoundMark{
         }
 
         //finds the mark furthest north and south
-        if(this.getMark1Position().getLongitude() > this.getMark2Position().getLongitude()){
+        if(this.getMark1Position().getLatitude() > this.getMark2Position().getLatitude()){
             northMostMark = this.mark1;
             southMostMark = this.mark2;
         }else{

racevisionGame/src/main/java/shared/model/RunnableWithFramePeriod.java

@@ -20,8 +20,7 @@ public interface RunnableWithFramePeriod extends Runnable {
      * @param currentFrameTime The timestamp of the current frame.
      * @param minimumFramePeriod The minimum period the frame must be.
      */
-    default void waitForFramePeriod(long previousFrameTime, long currentFrameTime, long minimumFramePeriod) throws Exception {
-
+    default void waitForFramePeriod(long previousFrameTime, long currentFrameTime, long minimumFramePeriod) {
 
         //This is the time elapsed, in milliseconds, since the last server "frame".
         long framePeriod = currentFrameTime - previousFrameTime;
@@ -39,10 +38,10 @@ public interface RunnableWithFramePeriod extends Runnable {
 
             } catch (InterruptedException e) {
                 //If we get interrupted, exit the function.
-                /*Logger.getGlobal().log(Level.SEVERE, "RunnableWithFramePeriod.waitForFramePeriod().sleep(framePeriod) was interrupted on thread: " + Thread.currentThread(), e);
+                //Logger.getGlobal().log(Level.WARNING, "RunnableWithFramePeriod.waitForFramePeriod().sleep(framePeriod) was interrupted on thread: " + Thread.currentThread(), e);
                 //Re-set the interrupt flag.
                 Thread.currentThread().interrupt();
-                return;*/
+                return;
 
             }