From 19f08de756085853adc4c7f5f2dbf352ce50afd9 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 7 Nov 2023 14:43:15 +0900 Subject: [PATCH] fix: pickaxe tooltip showing when other overlaying UI is opened --- .../terrarum/modulebasegame/gameitems/PickaxeGeneric.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt index 770a4b324..f519da90a 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt @@ -164,13 +164,16 @@ object PickaxeCore { fun showOresTooltip(actor: ActorWithBody, tool: GameItem, mx: Int, my: Int): Unit { if (App.getConfigBoolean("basegame:showpickaxetooltip")) { + + val overlayUIopen = (INGAME as? TerrarumIngame)?.uiBlur?.isVisible ?: false var tooltipSet = false + mouseInInteractableRangeTools(actor, tool) { val tileUnderCursor = INGAME.world.getTileFromOre(mx, my).item val playerCodex = (actor.actorValue.getAsString(AVKey.ORE_DICT) ?: "").split(',').filter { it.isNotBlank() } - if (tileUnderCursor != Block.AIR) { + if (tileUnderCursor != Block.AIR && !overlayUIopen) { val itemForOre = OreCodex[tileUnderCursor].item val tileName = if (playerCodex.binarySearch(itemForOre) >= 0) Lang[ItemCodex[itemForOre]!!.originalName]