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

Fixing everything you guys broke while I was gone...

Browse Source
This commit is contained in:
GJ
2013-05-14 11:28:50 -04:00
parent 0b18ae8ff2
commit 501f5de55a
5 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java
View File

@ -46,10 +46,11 @@ public final class MobHealthbarUtils {
PlayerProfile profile = UserManager.getPlayer(player).getProfile();
if (profile == null) {
return;
if (profile.getMobHealthbarType() == null) {
profile.setMobHealthbarType(Config.getInstance().getMobHealthbarDefault());
}
else if (profile.getMobHealthbarType() == MobHealthbarType.DISABLED) {
if (profile.getMobHealthbarType() == MobHealthbarType.DISABLED) {
return;
}

4
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
View File

@ -332,11 +332,11 @@ public class SkillUtils {
if (!mcMMOPlayer.getAbilityMode(ability) && cooldownOver(playerProfile.getSkillDATS(ability), ability.getCooldown(), player)) {
McMMOPlayerAbilityActivateEvent event = new McMMOPlayerAbilityActivateEvent(player, type);
mcMMO.p.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
}
int ticks = PerksUtils.handleActivationPerks(player, 2 + (playerProfile.getSkillLevel(type) / AdvancedConfig.getInstance().getAbilityLength()), ability.getMaxTicks());
ParticleEffectUtils.playAbilityEnabledEffect(player);