16 files changed, 122 insertions, 116 deletions
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/HasReceivedEvent.cs b/Client/Assets/Behavior Designer/Runtime/Conditionals/HasReceivedEvent.cs
index b9c16252..4ce69fba 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/HasReceivedEvent.cs
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/HasReceivedEvent.cs
@@ -1,5 +1,3 @@
-using UnityEngine;
-
 namespace BehaviorDesigner.Runtime.Tasks
 {
     [TaskDescription("Returns success as soon as the event specified by eventName has been received.")]
@@ -20,14 +18,18 @@ namespace BehaviorDesigner.Runtime.Tasks
         public SharedVariable storedValue3;
 
         private bool eventReceived = false;
+        private bool registered = false;
 
-        public override void OnAwake()
+        public override void OnStart()
         {
             // Let the behavior tree know that we are interested in receiving the event specified
-            Owner.RegisterEvent(eventName.Value, ReceivedEvent);
-            Owner.RegisterEvent<object>(eventName.Value, ReceivedEvent);
-            Owner.RegisterEvent<object, object>(eventName.Value, ReceivedEvent);
-            Owner.RegisterEvent<object, object, object>(eventName.Value, ReceivedEvent);
+            if (!registered) {
+                Owner.RegisterEvent(eventName.Value, ReceivedEvent);
+                Owner.RegisterEvent<object>(eventName.Value, ReceivedEvent);
+                Owner.RegisterEvent<object, object>(eventName.Value, ReceivedEvent);
+                Owner.RegisterEvent<object, object, object>(eventName.Value, ReceivedEvent);
+                registered = true;
+            }
         }
 
         public override TaskStatus OnUpdate()
@@ -37,6 +39,13 @@ namespace BehaviorDesigner.Runtime.Tasks
 
         public override void OnEnd()
         {
+            if (eventReceived) {
+                Owner.UnregisterEvent(eventName.Value, ReceivedEvent);
+                Owner.UnregisterEvent<object>(eventName.Value, ReceivedEvent);
+                Owner.UnregisterEvent<object, object>(eventName.Value, ReceivedEvent);
+                Owner.UnregisterEvent<object, object, object>(eventName.Value, ReceivedEvent);
+                registered = false;
+            }
             eventReceived = false;
         }
 
@@ -91,6 +100,8 @@ namespace BehaviorDesigner.Runtime.Tasks
             Owner.UnregisterEvent<object>(eventName.Value, ReceivedEvent);
             Owner.UnregisterEvent<object, object>(eventName.Value, ReceivedEvent);
             Owner.UnregisterEvent<object, object, object>(eventName.Value, ReceivedEvent);
+
+            eventReceived = false;
         }
 
         public override void OnReset()
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/HasReceivedEvent.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/HasReceivedEvent.cs.meta
index 9fd1d4e1..a6631149 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/HasReceivedEvent.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/HasReceivedEvent.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 7c0c7f545b074cb48bd552b038ede7af
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 7c0c7f545b074cb48bd552b038ede7af
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics.meta
index cdb80d4e..8ee18602 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics.meta
@@ -1,5 +1,4 @@
-fileFormatVersion: 2
-guid: 0c5a19b8daa7dbf4abe7505888ef0376
-folderAsset: yes
-DefaultImporter:
-  userData: 
+fileFormatVersion: 2
+guid: 0c5a19b8daa7dbf4abe7505888ef0376
+DefaultImporter:
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredCollision.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredCollision.cs.meta
index b6f4d04b..c756d7a3 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredCollision.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredCollision.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: c1841a802d7ceda449423f001897ecae
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: c1841a802d7ceda449423f001897ecae
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredCollision2D.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredCollision2D.cs.meta
index 1f0e945e..4deddc68 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredCollision2D.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredCollision2D.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 0ac128198630a2d4b9fee93cc9a1f8fd
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 0ac128198630a2d4b9fee93cc9a1f8fd
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredTrigger.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredTrigger.cs.meta
index bccb63ad..03153f36 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredTrigger.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredTrigger.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 5987844efe0fca7499cec04a9e3962cc
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 5987844efe0fca7499cec04a9e3962cc
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredTrigger2D.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredTrigger2D.cs.meta
index 4e98e7c7..9d0f038c 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredTrigger2D.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasEnteredTrigger2D.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 84e2afb791fe67243a15e45e4af81bb4
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 84e2afb791fe67243a15e45e4af81bb4
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedCollision.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedCollision.cs.meta
index 40e22c8b..20418202 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedCollision.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedCollision.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 900905a3e42f74c49a6e503349ee651e
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 900905a3e42f74c49a6e503349ee651e
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedCollision2D.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedCollision2D.cs.meta
index 48510c2a..f506a120 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedCollision2D.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedCollision2D.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 31cf8edd114ac5c4db22ec65babb3dd3
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 31cf8edd114ac5c4db22ec65babb3dd3
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedTrigger.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedTrigger.cs.meta
index 83c2828f..8d23602d 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedTrigger.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedTrigger.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: c7ccd4a2c35d4c748b65ccd086e777e1
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: c7ccd4a2c35d4c748b65ccd086e777e1
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedTrigger2D.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedTrigger2D.cs.meta
index 3d6d4f8a..18f0b421 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedTrigger2D.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Physics/HasExitedTrigger2D.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: ff0486d46da2f7844ac74c6e2ad5af89
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: ff0486d46da2f7844ac74c6e2ad5af89
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/RandomProbability.cs b/Client/Assets/Behavior Designer/Runtime/Conditionals/RandomProbability.cs
index a4c48c6f..e971bb3d 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/RandomProbability.cs
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/RandomProbability.cs
@@ -1,6 +1,4 @@
-using UnityEngine;
-
-namespace BehaviorDesigner.Runtime.Tasks
+namespace BehaviorDesigner.Runtime.Tasks
 {
     [TaskDescription("The random probability task will return success when the random probability is above the succeed probability. It will otherwise return failure.")]
     [HelpURL("http://www.opsive.com/assets/BehaviorDesigner/documentation.php?id=33")]
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/RandomProbability.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/RandomProbability.cs.meta
index 85b11855..e4c3ed3d 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/RandomProbability.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/RandomProbability.cs.meta
@@ -1,8 +1,7 @@
-fileFormatVersion: 2
-guid: 468a21510e9558c49a47238ebe4c2270
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: 468a21510e9558c49a47238ebe4c2270
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection.meta
index 8e65537d..4f494a05 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection.meta
@@ -1,5 +1,4 @@
-fileFormatVersion: 2
-guid: caf1fead4d83193488aaa4560c36880c
-folderAsset: yes
-DefaultImporter:
-  userData: 
+fileFormatVersion: 2
+guid: caf1fead4d83193488aaa4560c36880c
+DefaultImporter:
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection/CompareFieldValue.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection/CompareFieldValue.cs.meta
index 42f0e6bb..4daf721d 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection/CompareFieldValue.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection/CompareFieldValue.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: cc6496fb6757b684c8cc0c4ac8929319
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: cc6496fb6757b684c8cc0c4ac8929319
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
diff --git a/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection/ComparePropertyValue.cs.meta b/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection/ComparePropertyValue.cs.meta
index 59fbef22..d858e0aa 100644
--- a/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection/ComparePropertyValue.cs.meta
+++ b/Client/Assets/Behavior Designer/Runtime/Conditionals/Reflection/ComparePropertyValue.cs.meta
@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: f8b0fa403f826a74087ece4b81fec1c7
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
+fileFormatVersion: 2
+guid: f8b0fa403f826a74087ece4b81fec1c7
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: