From 8f8036a5180b8f84a0cbee04ed14a16f26f46145 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 17 Jul 2024 16:58:58 +0100 Subject: [PATCH] Minor codestyle improvements --- .../main/kotlin/com/willfp/ecoscrolls/gui/InscriptionTable.kt | 4 ++-- .../src/main/kotlin/com/willfp/ecoscrolls/scrolls/Scroll.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoscrolls/gui/InscriptionTable.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoscrolls/gui/InscriptionTable.kt index d87e578..1ee3c17 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoscrolls/gui/InscriptionTable.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoscrolls/gui/InscriptionTable.kt @@ -139,13 +139,13 @@ internal fun updateInscribeMenu(plugin: EcoScrollsPlugin) { } onOpen { player, _ -> - openEffects?.trigger(TriggerData(player = player).dispatch(player.toDispatcher())) + openEffects?.trigger(player.toDispatcher(), TriggerData(player = player)) } onClose { event, menu -> val player = event.player as Player - closeEffects?.trigger(TriggerData(player = player).dispatch(player.toDispatcher())) + closeEffects?.trigger(player.toDispatcher(), TriggerData(player = player)) DropQueue(player) .addItems(menu.getCaptiveItems(player)) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoscrolls/scrolls/Scroll.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoscrolls/scrolls/Scroll.kt index 0182515..fb911b6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoscrolls/scrolls/Scroll.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoscrolls/scrolls/Scroll.kt @@ -231,11 +231,12 @@ class Scroll( inscribe(itemStack) inscriptionEffects?.trigger( + player.toDispatcher(), TriggerData( player = player, item = itemStack, value = itemStack.getScrollLevel(this)?.level?.toDouble() ?: 1.0 - ).dispatch(player.toDispatcher()) + ) ) return true