REBASE: debugging changes

team-2073-eagleforce · Mar 6, 2019 · ce237c5 · ce237c5
1 parent c9f38fe
commit ce237c5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/common-wpi-util/src/main/java/com/team2073/common/mediator/Mediator.java b/common-wpi-util/src/main/java/com/team2073/common/mediator/Mediator.java
@@ -157,8 +157,11 @@ private void execute(Request request) {
         Class subsystem = request.getSubsystem();
 
         if (conflicts.isEmpty() || request.getParallelConflict() != null) {
-            if (request.getParallelConflict() != null && request.getParallelConflict().canOverrideConflict(subsystemMap.get(request.getParallelConflict().getOriginSubsystem()),
-                    subsystemMap.get(request.getParallelConflict().getConflictingSubsystem()))) {
+            if (request.getParallelConflict() != null
+                    && request.getParallelConflict().canOverrideConflict(subsystemMap.get(request.getParallelConflict().getOriginSubsystem()),
+                    subsystemMap.get(request.getParallelConflict().getConflictingSubsystem()))
+                    && request.getParallelConflict().isRequestConflicting(request, subsystemMap.get(request.getParallelConflict().getConflictingSubsystem()).getCurrentCondition(),
+                    subsystemMap.get(request.getParallelConflict().getOriginSubsystem()).getCurrentCondition())) {
                 Conflict parallelConflict = request.getParallelConflict();
                 logger.debug("Executing parallel Conflict [{}]", parallelConflict.getName());
                 Condition requestedParallelCondition = parallelConflict.getOriginParallelResolution(subsystemMap.get(parallelConflict.getOriginSubsystem()),