From 695493f7e98aaa365072329abc6e909e20917eed Mon Sep 17 00:00:00 2001 From: Danielle Voznyy Date: Sun, 28 Jan 2024 17:13:32 -0500 Subject: [PATCH] Fix mobzy spawn conditions to select for source --- .../conditions/components/BlockCompositionCondition.kt | 2 +- .../spawning/conditions/components/LocalGroupConditions.kt | 4 ++-- .../spawning/conditions/components/SpawnDelayCondition.kt | 3 +-- .../mobzy/spawning/conditions/components/SpawnGapCondition.kt | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/BlockCompositionCondition.kt b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/BlockCompositionCondition.kt index 46036922..57e33336 100644 --- a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/BlockCompositionCondition.kt +++ b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/BlockCompositionCondition.kt @@ -23,7 +23,7 @@ class BlockComposition( @AutoScan class BlockCompositionCondition : CheckingListener() { - private val Pointers.blockComposition by get().on(target) + private val Pointers.blockComposition by get().on(source) val Pointers.spawnInfo by get().on(event) override fun Pointers.check(): Boolean = diff --git a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/LocalGroupConditions.kt b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/LocalGroupConditions.kt index 41856754..ed45e311 100644 --- a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/LocalGroupConditions.kt +++ b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/LocalGroupConditions.kt @@ -23,8 +23,8 @@ class LocalGroupConditions( @AutoScan class CapFull : CheckingListener() { - val Pointers.conf by get().on(target) - val Pointers.spawnType by get().on(target) + val Pointers.conf by get().on(source) + val Pointers.spawnType by get().on(source) val Pointers.spawnInfo by get().on(event) diff --git a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/SpawnDelayCondition.kt b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/SpawnDelayCondition.kt index 9e9b0bfa..b11a26df 100644 --- a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/SpawnDelayCondition.kt +++ b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/SpawnDelayCondition.kt @@ -19,8 +19,7 @@ class SpawnDelay( @AutoScan class SpawnDelayCondition : CheckingListener() { - - private val Pointers.delay by get().on(target) + private val Pointers.delay by get().on(source) override fun Pointers.check(): Boolean { val iterationMod = (delay.attemptEvery / mobzySpawning.config.spawnTaskDelay) diff --git a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/SpawnGapCondition.kt b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/SpawnGapCondition.kt index ad5875db..46a34d83 100644 --- a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/SpawnGapCondition.kt +++ b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/conditions/components/SpawnGapCondition.kt @@ -22,7 +22,7 @@ class SpawnGap( @AutoScan class SpawnGapCondition : CheckingListener() { - private val Pointers.spawnGap by get().on(target) + private val Pointers.spawnGap by get().on(source) private val Pointers.spawnInfo by get().on(event)