diff options
author | VeritasDL <121319869+VeritasDL@users.noreply.github.com> | 2024-04-08 15:53:55 -0400 |
---|---|---|
committer | VeritasDL <121319869+VeritasDL@users.noreply.github.com> | 2024-04-19 18:01:00 -0400 |
commit | e6c0ca1ec23dfcd6e0137628a1df9d15cb65ab0d (patch) | |
tree | 0192a38e44c0b4f010b876219c25f93181b0e09b /src/main | |
parent | 774a0f7af1cca495c65292f1e6012229ea10f5f9 (diff) | |
download | Skyblocker-e6c0ca1ec23dfcd6e0137628a1df9d15cb65ab0d.tar.gz Skyblocker-e6c0ca1ec23dfcd6e0137628a1df9d15cb65ab0d.tar.bz2 Skyblocker-e6c0ca1ec23dfcd6e0137628a1df9d15cb65ab0d.zip |
Update ItemCooldowns.java
github, intellij or I suck
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java index d1868550..86765499 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/ItemCooldowns.java @@ -53,7 +53,6 @@ public class ItemCooldowns { public static double CalcMonkeyExp = 0; public static double currentCooldown = 0; public static long unixTimeStamp = 0; - public static void init() { ClientPlayerBlockBreakEvents.AFTER.register(ItemCooldowns::afterBlockBreak); UseItemCallback.EVENT.register(ItemCooldowns::onItemInteract); @@ -115,8 +114,8 @@ public class ItemCooldowns { String usedItemId = ItemUtils.getItemId(player.getMainHandStack()); if (usedItemId.isEmpty()) return; if (state.isIn(BlockTags.LOGS)) { - currentCooldown(); if (usedItemId.equals(JUNGLE_AXE_ID) || usedItemId.equals(TREECAPITATOR_ID)) { + currentCooldown(); if (!isOnCooldown(JUNGLE_AXE_ID) || !isOnCooldown(TREECAPITATOR_ID)) { ITEM_COOLDOWNS.put(usedItemId, new CooldownEntry((int) currentCooldown)); } @@ -127,7 +126,6 @@ public class ItemCooldowns { private static TypedActionResult<ItemStack> onItemInteract(PlayerEntity player, World world, Hand hand) { if (!SkyblockerConfigManager.get().general.itemCooldown.enableItemCooldowns) return TypedActionResult.pass(ItemStack.EMPTY); - String usedItemId = ItemUtils.getItemId(player.getMainHandStack()); if (usedItemId.equals(GRAPPLING_HOOK_ID) && player.fishHook != null) { if (!isOnCooldown(GRAPPLING_HOOK_ID) && !isWearingBatArmor(player)) { @@ -188,4 +186,4 @@ public class ItemCooldowns { return this.isOnCooldown() ? (float) this.getRemainingCooldown() / cooldown : 0.0f; } } -}
\ No newline at end of file +} |