Fix trigger catch check

makscee · May 2, 2024 · a07e665 · a07e665
1 parent dc06d71
commit a07e665
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/plugins/server.rs b/src/plugins/server.rs
@@ -50,7 +50,7 @@ fn clear_pending(status: &Status) {
             e.to_owned(),
             None,
         ),
-        Status::Committed => info!("Server operation commited"),
+        Status::Committed => info!("Server operation committed"),
         _ => {}
     }
     OperationsPlugin::add(move |world| {

diff --git a/src/resources/trigger.rs b/src/resources/trigger.rs
@@ -328,8 +328,10 @@ impl Trigger {
                 targets,
                 effects,
             } => {
+                let mut result = false;
                 for (trigger, _) in triggers {
                     if trigger.catch(event, context, world) {
+                        result = true;
                         for (effect, _) in effects.iter() {
                             if targets.is_empty() {
                                 ActionPlugin::action_push_back(
@@ -349,7 +351,7 @@ impl Trigger {
                         }
                     }
                 }
-                true
+                result
             }
             Trigger::Change { .. } => false,
         }