Merge pull request #78 from CommunalHelper/misc-additions

move resetActivation to update

Author: vitellaryjr

Code/TriggerTrigger.cs

@@ -187,6 +187,12 @@ public override void Update() {
                     UpdateTriggers(player);
                 }
             }
+
+            if (resetActivation)
+            {
+                externalActivation = false;
+                resetActivation = false;
+            }
         }
 
         public void UpdateConditions(Player player) {
@@ -337,11 +343,6 @@ public bool GetActivateCondition(Player player) {
             }
             if (externalActivation) {
                 result = true;
-                if (resetActivation)
-                {
-                    externalActivation = false;
-                    resetActivation = false;
-                }
             }
             if (invertCondition) {
                 result = !result;