From fa4063d358f3a9f15b867c593532b00c38f5232d Mon Sep 17 00:00:00 2001 From: Kaluub <60589762+Kaluub@users.noreply.github.com> Date: Sat, 20 Jan 2024 15:37:49 -0500 Subject: Dungeons improvements (#493) * Add setting for dropping protected items in dungeons * Fix Livid colour text --- .../java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java') diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java index dd207dc0..1d54b02c 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayerEntityMixin.java @@ -2,6 +2,7 @@ package de.hysky.skyblocker.mixin; import com.mojang.authlib.GameProfile; +import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.dungeon.partyfinder.PartyFinderScreen; import de.hysky.skyblocker.skyblock.item.HotbarSlotLock; import de.hysky.skyblocker.skyblock.item.ItemProtection; @@ -31,7 +32,12 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity @Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true) public void skyblocker$dropSelectedItem(CallbackInfoReturnable cir) { if (Utils.isOnSkyblock()) { - if (ItemProtection.isItemProtected(this.getInventory().getMainHandStack())) cir.setReturnValue(false); + if (ItemProtection.isItemProtected(this.getInventory().getMainHandStack())) { + if (!SkyblockerConfigManager.get().locations.dungeons.allowDroppingProtectedItems + || (SkyblockerConfigManager.get().locations.dungeons.allowDroppingProtectedItems && !Utils.isInDungeons())) { + cir.setReturnValue(false); + } + } HotbarSlotLock.handleDropSelectedItem(this.getInventory().selectedSlot, cir); } } -- cgit