Skip to content

Commit 73829dc

Browse files
Merge pull request #5 from theSimpleCloud/develop
fix: tag resolver in SinglePlaceholderExecutor
2 parents f75f802 + 9519895 commit 73829dc

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/provider/AbstractPlaceholderProvider.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ abstract class AbstractPlaceholderProvider<T>(
4242
*getArgumentsResolvers(this.controllerApi, value).toTypedArray(),
4343
*argumentsResolver
4444
)
45-
val resolvers = this.executor.getTagResolvers(this.controllerApi, value, prefix).toTypedArray()
46-
println("singleResolvers: ${resolvers.size} | available: ${availableArgumentsResolver.size}")
45+
val singleTagResolver = this.executor.getTagResolver(this.controllerApi, value, prefix)
46+
println("singleResolvers: ${singleTagResolver.has("group_name")} | available: ${availableArgumentsResolver.size}")
4747
return TagResolver.resolver(
48-
*resolvers,
48+
singleTagResolver,
4949
*availableArgumentsResolver
5050
.map { convertArgumentsResolverToTagResolver(it, prefix) }
5151
.toTypedArray()

plugin-shared/src/main/kotlin/app/simplecloud/plugin/api/shared/placeholder/single/SinglePlaceholderExecutor.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,18 @@ interface SinglePlaceholderExecutor<T> {
1717
fun getAsyncPlaceholders(controllerApi: ControllerApi.Coroutine): List<AsyncPlaceholder<T>>
1818

1919
/**
20-
* Gets a list with all available tag resolvers from the [getAsyncPlaceholders] method
20+
* Gets a [TagResolver] with all available tag resolvers from the [getAsyncPlaceholders] method
2121
* @param controllerApi the instance of [ControllerApi.Coroutine]
2222
* @param value for the placeholder
2323
* @param prefix first name for the placeholder key
2424
*/
25-
suspend fun getTagResolvers(controllerApi: ControllerApi.Coroutine, value: T, prefix: String? = null): List<TagResolver> {
26-
return getAsyncPlaceholders(controllerApi)
27-
.map { it.invokeTagResolver(value) }
25+
suspend fun getTagResolver(
26+
controllerApi: ControllerApi.Coroutine,
27+
value: T,
28+
prefix: String? = null,
29+
): TagResolver {
30+
return TagResolver.resolver(getAsyncPlaceholders(controllerApi)
31+
.map { it.invokeTagResolver(value) })
2832
}
2933

3034
}

0 commit comments

Comments
 (0)