diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/EcoGUIFactory.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/EcoGUIFactory.kt index a6c7605b..02784d89 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/EcoGUIFactory.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/EcoGUIFactory.kt @@ -6,7 +6,7 @@ import com.willfp.eco.core.gui.menu.MenuBuilder import com.willfp.eco.core.gui.slot.SlotBuilder import com.willfp.eco.core.gui.slot.functional.SlotProvider import com.willfp.eco.internal.gui.menu.EcoMenuBuilder -import com.willfp.eco.internal.gui.page.DelegateMenu +import com.willfp.eco.internal.gui.page.MergedStateMenu import com.willfp.eco.internal.gui.slot.EcoSlotBuilder object EcoGUIFactory : GUIFactory { @@ -19,6 +19,6 @@ object EcoGUIFactory : GUIFactory { } override fun blendMenuState(base: Menu, additional: Menu): Menu { - return DelegateMenu(base, additional) + return MergedStateMenu(base, additional) } } diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/page/DelegateMenu.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/page/MergedStateMenu.kt similarity index 85% rename from eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/page/DelegateMenu.kt rename to eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/page/MergedStateMenu.kt index 3168ba73..d90241ec 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/page/DelegateMenu.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/gui/page/MergedStateMenu.kt @@ -3,7 +3,7 @@ package com.willfp.eco.internal.gui.page import com.willfp.eco.core.gui.menu.Menu import org.bukkit.entity.Player -class DelegateMenu( +class MergedStateMenu( private val base: Menu, private val additional: Menu ) : Menu by base { @@ -17,9 +17,11 @@ class DelegateMenu( override fun clearState(player: Player) { base.clearState(player) + additional.clearState(player) } override fun removeState(player: Player, key: String) { base.removeState(player, key) + additional.removeState(player, key) } }