Unused triggers will no longer be dispatched

Auxilor · May 24, 2023 · addb36c · addb36c
1 parent ebce265
commit addb36c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/core/src/main/kotlin/com/willfp/libreforge/triggers/DispatchedTriggerFactory.kt b/core/src/main/kotlin/com/willfp/libreforge/triggers/DispatchedTriggerFactory.kt
@@ -17,6 +17,10 @@ class DispatchedTriggerFactory(
     private val playerTriggers = listMap<UUID, Int>()
 
     fun create(player: Player, trigger: Trigger, data: TriggerData): DispatchedTrigger? {
+        if (!trigger.isEnabled) {
+            return null
+        }
+
         val hash = (trigger.hashCode() shl 5) xor data.hashCode()
         if (hash in playerTriggers[player.uniqueId]) {
             return null

diff --git a/core/src/main/kotlin/com/willfp/libreforge/triggers/Trigger.kt b/core/src/main/kotlin/com/willfp/libreforge/triggers/Trigger.kt
@@ -19,6 +19,12 @@ abstract class Trigger(
      */
     abstract val parameters: Set<TriggerParameter>
 
+    /**
+     * Whether this trigger is enabled.
+     */
+    var isEnabled: Boolean = false
+        internal set
+
     /**
      * Dispatch the trigger.
      */

diff --git a/core/src/main/kotlin/com/willfp/libreforge/triggers/Triggers.kt b/core/src/main/kotlin/com/willfp/libreforge/triggers/Triggers.kt
@@ -84,8 +84,16 @@ object Triggers : Registry<Trigger>() {
 
     /**
      * Get a trigger by [id].
+     *
+     * This will enable the trigger.
      */
     override fun get(id: String): Trigger? {
+        return doGet(id)?.apply {
+            isEnabled = true
+        }
+    }
+
+    private fun doGet(id: String): Trigger? {
         for (group in groupRegistry.values()) {
             if (id.startsWith("${group.prefix}_")) {
                 return group.create(id.removePrefix("${group.prefix}_"))