Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-11 03:41:23 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed dyamite triggering on air click

Browse Source
This commit is contained in:
Auxilor 2021-02-04 21:40:08 +00:00
parent f3c2afadbe
commit 0a95a8dba5
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java
View File

@ -81,4 +81,9 @@ public class Dynamite extends Spell {
AnticheatManager.unexemptPlayer(player); AnticheatManager.unexemptPlayer(player);
} }
@Override
protected boolean requiresBlockClick() {
return true;
}
} }

15
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java
View File

@ -92,10 +92,16 @@ public abstract class Spell extends EcoEnchant {
if (!(event.getAction().equals(Action.LEFT_CLICK_AIR) || event.getAction().equals(Action.LEFT_CLICK_BLOCK))) { if (!(event.getAction().equals(Action.LEFT_CLICK_AIR) || event.getAction().equals(Action.LEFT_CLICK_BLOCK))) {
return; return;
} }
if (requiresBlockClick() && !event.getAction().equals(Action.LEFT_CLICK_BLOCK)) {
return;
}
} else { } else {
if (!(event.getAction().equals(Action.RIGHT_CLICK_AIR) || event.getAction().equals(Action.RIGHT_CLICK_BLOCK))) { if (!(event.getAction().equals(Action.RIGHT_CLICK_AIR) || event.getAction().equals(Action.RIGHT_CLICK_BLOCK))) {
return; return;
} }
if (requiresBlockClick() && !event.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
return;
}
} }
if (!EnchantChecks.mainhand(player, this)) { if (!EnchantChecks.mainhand(player, this)) {
@ -140,6 +146,15 @@ public abstract class Spell extends EcoEnchant {
runnable.run(); runnable.run();
} }
/**
* Get if the spell requires a block to be clicked to trigger the spell.
*
* @return If the spell requires a block to be clicked.
*/
protected boolean requiresBlockClick() {
return false;
}
/** /**
* Actual spell-specific implementations; the functionality. * Actual spell-specific implementations; the functionality.
* *