Do not activate wired conditions unless double-clicked

This commit is contained in:
Alejandro 2020-02-27 22:39:31 +02:00
parent ece55786d8
commit b8d52b08d3

View File

@ -139,12 +139,11 @@ public class WiredHandler {
} }
for (InteractionWiredCondition condition : conditions) { for (InteractionWiredCondition condition : conditions) {
if ((condition.operator() == WiredConditionOperator.OR && matchedConditions.contains(condition.getType())) || if (!((condition.operator() == WiredConditionOperator.OR && matchedConditions.contains(condition.getType())) ||
(condition.operator() == WiredConditionOperator.AND && condition.execute(roomUnit, room, stuff))) { (condition.operator() == WiredConditionOperator.AND && condition.execute(roomUnit, room, stuff))) &&
condition.activateBox(room); !Emulator.getPluginManager().fireEvent(new WiredConditionFailedEvent(room, roomUnit, trigger, condition)).isCancelled()) {
} else {
if (!Emulator.getPluginManager().fireEvent(new WiredConditionFailedEvent(room, roomUnit, trigger, condition)).isCancelled()) return false;
return false;
} }
} }
} }