EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-03 13:05:30 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows

Browse Source
This commit is contained in:
nossr50
2020-08-20 17:30:21 -07:00
parent daada1a643 b35c58ec21
commit 642a351bb5
23 changed files with 458 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java
View File

@@ -37,7 +37,7 @@ public class AbilityDisableTask extends BukkitRunnable {
switch (ability) {
case SUPER_BREAKER:
case GIGA_DRILL_BREAKER:
SkillUtils.handleAbilitySpeedDecrease(player);
SkillUtils.removeAbilityBoostsFromInventory(player);
// Fallthrough
case BERSERK:

3
src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java
View File

@@ -188,6 +188,9 @@ public class BleedTimerTask extends BukkitRunnable {
if(toolTier < 4)
ticks = Math.max(1, (ticks / 3));
ticks+=1;
BleedContainer newBleedContainer = new BleedContainer(entity, ticks, bleedRank, toolTier, attacker);
bleedList.put(entity, newBleedContainer);
}