EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 19:54:44 +02:00
Code Issues Projects Releases Wiki Activity

some work on limit break for tridents/xbows

Browse Source
This commit is contained in:
nossr50
2020-07-07 08:34:59 -07:00
parent ea448dfa47
commit 5cd1419b21
7 changed files with 81 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java
View File

@ -66,8 +66,8 @@ public enum PrimarySkillType {
ImmutableList.of(SubSkillType.UNARMED_BERSERK, SubSkillType.UNARMED_UNARMED_LIMIT_BREAK, SubSkillType.UNARMED_BLOCK_CRACKER, SubSkillType.UNARMED_ARROW_DEFLECT, SubSkillType.UNARMED_DISARM, SubSkillType.UNARMED_IRON_ARM_STYLE, SubSkillType.UNARMED_IRON_GRIP)),
WOODCUTTING(WoodcuttingManager.class, Color.OLIVE, SuperAbilityType.TREE_FELLER, ToolType.AXE,
ImmutableList.of(SubSkillType.WOODCUTTING_LEAF_BLOWER, SubSkillType.WOODCUTTING_TREE_FELLER, SubSkillType.WOODCUTTING_HARVEST_LUMBER)),
TRIDENTS(TridentManager.class, Color.TEAL, ImmutableList.of(SubSkillType.TRIDENTS_MULTI_TASKING)),
CROSSBOWS(CrossbowManager.class, Color.ORANGE, ImmutableList.of(SubSkillType.CROSSBOWS_CONE_OF_DEATH));
TRIDENTS(TridentManager.class, Color.TEAL, ImmutableList.of(SubSkillType.TRIDENTS_MULTI_TASKING, SubSkillType.TRIDENTS_TRIDENTS_LIMIT_BREAK)),
CROSSBOWS(CrossbowManager.class, Color.ORANGE, ImmutableList.of(SubSkillType.CROSSBOWS_CONE_OF_DEATH, SubSkillType.CROSSBOWS_CROSSBOWS_LIMIT_BREAK));
private Class<? extends SkillManager> managerClass;
private Color skillColor;

4
src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java
View File

@ -109,10 +109,12 @@ public enum SubSkillType {
/* TRIDENTS */
TRIDENTS_MULTI_TASKING(5),
TRIDENTS_TRIDENTS_LIMIT_BREAK(10),
/* CROSSBOWS */
CROSSBOWS_CONE_OF_DEATH(8);
CROSSBOWS_CONE_OF_DEATH(8),
CROSSBOWS_CROSSBOWS_LIMIT_BREAK(10);
private final int numRanks;

3
src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
View File

@ -436,6 +436,9 @@ public class InventoryListener implements Listener {
public void onInventoryClickEvent(InventoryClickEvent event) {
SkillUtils.removeAbilityBuff(event.getCurrentItem());
if (event.getAction() == InventoryAction.HOTBAR_SWAP) {
PlayerInventory playerInventory = event.getWhoClicked().getInventory();
if(playerInventory.getSize())
if(event.getWhoClicked().getInventory().getItem(event.getHotbarButton()) != null)
SkillUtils.removeAbilityBuff(event.getWhoClicked().getInventory().getItem(event.getHotbarButton()));
}