Merge branch 'patch-timer-reset' into 'dev'

Wired Reset Timers Effect should also reset Wired Trigger Periodically and Wired Trigger Periodically Long

See merge request morningstar/Arcturus-Community!72
This commit is contained in:
Harmonic 2020-01-21 15:18:30 -05:00
commit b35e27ea8e

View File

@ -419,7 +419,8 @@ public class WiredHandler {
return; return;
THashSet<InteractionWiredTrigger> triggers = room.getRoomSpecialTypes().getTriggers(WiredTriggerType.AT_GIVEN_TIME); THashSet<InteractionWiredTrigger> triggers = room.getRoomSpecialTypes().getTriggers(WiredTriggerType.AT_GIVEN_TIME);
triggers.addAll(room.getRoomSpecialTypes().getTriggers(WiredTriggerType.PERIODICALLY));
triggers.addAll(room.getRoomSpecialTypes().getTriggers(WiredTriggerType.PERIODICALLY_LONG));
if (triggers != null) { if (triggers != null) {
for (InteractionWiredTrigger trigger : triggers) { for (InteractionWiredTrigger trigger : triggers) {
((WiredTriggerReset) trigger).resetTimer(); ((WiredTriggerReset) trigger).resetTimer();