If region is left blank for events, then it triggers for all regions

gabber235 · Jan 2, 2025 · da9fe24 · da9fe24
1 parent 9faff96
commit da9fe24
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/...engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/VariableEntry.kt b/...engine-paper/src/main/kotlin/com/typewritermc/engine/paper/entry/entries/VariableEntry.kt
@@ -54,6 +54,10 @@ fun <T : Any> Var<T>.get(player: Player?, interactionContext: InteractionContext
 
 class ConstVar<T : Any>(val value: T) : Var<T> {
     override fun get(player: Player, interactionContext: InteractionContext?): T = value
+
+    override fun toString(): String {
+        return "ConstVar($value)"
+    }
 }
 
 class BackedVar<T : Any>(
@@ -65,6 +69,10 @@ class BackedVar<T : Any>(
         val entry = ref.get() ?: throw IllegalStateException("Could not find variable entry, $ref")
         return entry.get(VarContext(player, data, klass, interactionContext))
     }
+
+    override fun toString(): String {
+        return "BackedVar(ref=$ref, data=$data, klass=$klass)"
+    }
 }
 
 class MappedVar<T : Any>(
@@ -74,6 +82,9 @@ class MappedVar<T : Any>(
     override fun get(player: Player, interactionContext: InteractionContext?): T {
         return mapper(player, variable.get(player, interactionContext))
     }
+    override fun toString(): String {
+        return "MappedVar(variable=$variable, mapper=$mapper)"
+    }
 }
 
 fun <T : Any> Var<T>.map(mapper: (Player, T) -> T): Var<T> = MappedVar(this, mapper)
diff --git a/...ension/src/main/kotlin/com/typewritermc/worldguard/entries/event/EnterRegionEventEntry.kt b/...ension/src/main/kotlin/com/typewritermc/worldguard/entries/event/EnterRegionEventEntry.kt
@@ -5,6 +5,7 @@ import com.typewritermc.core.entries.Query
 import com.typewritermc.core.entries.Ref
 import com.typewritermc.core.extension.annotations.Entry
 import com.typewritermc.core.extension.annotations.EntryListener
+import com.typewritermc.core.extension.annotations.Help
 import com.typewritermc.core.interaction.context
 import com.typewritermc.engine.paper.entry.TriggerableEntry
 import com.typewritermc.engine.paper.entry.entries.EventEntry
@@ -25,11 +26,12 @@ class EnterRegionEventEntry(
     override val id: String = "",
     override val name: String = "",
     override val triggers: List<Ref<TriggerableEntry>> = emptyList(),
+    @Help("If left blank, it will trigger for all regions")
     val region: String = "",
 ) : EventEntry
 
 @EntryListener(EnterRegionEventEntry::class)
 fun onEnterRegions(event: RegionsEnterEvent, query: Query<EnterRegionEventEntry>) {
-    query.findWhere { it.region in event }.triggerAllFor(event.player, context())
+    query.findWhere { it.region.isBlank() || it.region in event }.triggerAllFor(event.player, context())
 }
 
diff --git a/...tension/src/main/kotlin/com/typewritermc/worldguard/entries/event/ExitRegionEventEntry.kt b/...tension/src/main/kotlin/com/typewritermc/worldguard/entries/event/ExitRegionEventEntry.kt
@@ -5,6 +5,7 @@ import com.typewritermc.core.entries.Query
 import com.typewritermc.core.entries.Ref
 import com.typewritermc.core.extension.annotations.Entry
 import com.typewritermc.core.extension.annotations.EntryListener
+import com.typewritermc.core.extension.annotations.Help
 import com.typewritermc.core.interaction.context
 import com.typewritermc.engine.paper.entry.TriggerableEntry
 import com.typewritermc.engine.paper.entry.entries.EventEntry
@@ -25,11 +26,12 @@ class ExitRegionEventEntry(
     override val id: String = "",
     override val name: String = "",
     override val triggers: List<Ref<TriggerableEntry>> = emptyList(),
+    @Help("If left blank, it will trigger for all regions")
     val region: String = "",
 ) : EventEntry
 
 @EntryListener(ExitRegionEventEntry::class)
 fun onExitRegions(event: RegionsExitEvent, query: Query<ExitRegionEventEntry>) {
-    query.findWhere { it.region in event }.triggerAllFor(event.player, context())
+    query.findWhere { it.region.isBlank() || it.region in event }.triggerAllFor(event.player, context())
 }