Merge branch 'cherry-pick-67d8cbd0' into 'master'

Fixed: Critical Bug in Movement Pause Time Calculations

See merge request simonstrator/simonstrator-peerfactsim!27

src/de/tud/kom/p2psim/impl/topology/movement/modularosm/ModularMultiTypeMovementModel.java

@@ -111,8 +111,12 @@ public class ModularMultiTypeMovementModel extends ModularMovementModel
                     .getComponentOrNull(Topology.class)
                     .getWorldDimensions().getY();
         } else {
-            if(transitions.containsKey(ms)) transitions.get(ms).reachedAttractionPoint(ms);
-            else transition.reachedAttractionPoint(ms);
+            if(transitions.containsKey(ms)) {
+            	transitions.get(ms).reachedAttractionPoint(ms);
+            }
+            else {
+            	transition.reachedAttractionPoint(ms);
+            }
             movementListeners.forEach(l -> l.onTransition(ms));
         }
     }

src/de/tud/kom/p2psim/impl/topology/movement/modularosm/transition/WeightedTransitionStrategy.java

@@ -125,7 +125,12 @@ public class WeightedTransitionStrategy implements ITransitionStrategy, EventHan
 	}
 
 	@Override
-	public void reachedAttractionPoint(SimLocationActuator ms) {
+	public void reachedAttractionPoint(SimLocationActuator ms) {	
+		// JZ: Added this to prevent multiple calls while pausing
+		if (!this.assignments.containsKey(ms)) {			
+			return;
+		}		
+		
 		this.lastAssignments.put(ms, this.assignments.remove(ms));
 		Event.scheduleWithDelay(getPauseTime(ms), this, ms, EVENT_PAUSE_ENDED);
 	}