Skip to content

Commit 6d41ade

Browse files
committed
fix: also account for ability cooldowns
1 parent 2269064 commit 6d41ade

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityLeftUse.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ public void run(PlayerHandAnimationEvent event) {
4545
return;
4646
}
4747

48-
abilityHandler.startAbilityCooldown(item);
49-
ability.execute(player, item);
48+
if(ability.execute(player, item)){
49+
abilityHandler.startAbilityCooldown(item);
50+
}
5051
}
5152
}
5253
}

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/item/ActionItemAbilityRightUse.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ public void run(PlayerUseItemEvent event) {
5050
return;
5151
}
5252

53-
abilityHandler.startAbilityCooldown(item);
54-
ability.execute(player, item);
53+
if(ability.execute(player, item)){
54+
abilityHandler.startAbilityCooldown(item);
55+
}
5556
}
5657
}
5758
}

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/ability/RegisteredAbility.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,20 @@ public RegisteredAbility(String id, String name, BiFunction<SkyBlockPlayer, SkyB
3636
this.action = action;
3737
}
3838

39-
public void execute(SkyBlockPlayer player, SkyBlockItem item) {
40-
execute(player, item, null, null);
39+
public boolean execute(SkyBlockPlayer player, SkyBlockItem item) {
40+
return execute(player, item, null, null);
4141
}
4242

43-
public void execute(SkyBlockPlayer player, SkyBlockItem item, Point targetedBlock, BlockFace blockFace) {
43+
public boolean execute(SkyBlockPlayer player, SkyBlockItem item, Point targetedBlock, BlockFace blockFace) {
4444
if (!cost.canUse(player)) {
4545
cost.onFail(player);
46-
return;
46+
return false;
4747
}
4848
if (!action.execute(player, item, targetedBlock, blockFace)){
49-
return;
49+
return false;
5050
}
5151
cost.onUse(player, this);
52+
return true;
5253
}
5354

5455
@FunctionalInterface

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/item/handlers/interactable/InteractableRegistry.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public class InteractableRegistry {
5858

5959
ServerHolograms.addExternalHologram(hologram);
6060
jerryInformation.setHologram(hologram);
61+
skyBlockItem.setAmount(0);
6162
})
6263
).build());
6364
}

0 commit comments

Comments
 (0)