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

SuperAbilityManager will handle super ability stuff

Browse Source
This commit is contained in:
nossr50
2020-07-30 19:23:10 -07:00
parent 2020fdd4ea
commit df7c9e0b1c
21 changed files with 392 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java
View File

@@ -17,11 +17,11 @@ public class AbilityCooldownTask extends BukkitRunnable {
@Override
public void run() {
if (!mcMMOPlayer.getPlayer().isOnline() || mcMMOPlayer.getAbilityInformed(ability)) {
if (!mcMMOPlayer.getPlayer().isOnline() || mcMMOPlayer.getSuperAbilityManager().getAbilityInformed(ability)) {
return;
}
mcMMOPlayer.setAbilityInformed(ability, true);
mcMMOPlayer.getSuperAbilityManager().setAbilityInformed(ability, true);
NotificationManager.sendPlayerInformation(mcMMOPlayer.getPlayer(), NotificationType.ABILITY_REFRESHED, ability.getAbilityRefresh());
//mcMMOPlayer.getPlayer().sendMessage(ability.getAbilityRefresh());

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

@@ -28,7 +28,7 @@ public class AbilityDisableTask extends BukkitRunnable {
@Override
public void run() {
if (!mcMMOPlayer.getAbilityMode(ability)) {
if (!mcMMOPlayer.getSuperAbilityManager().getAbilityMode(ability)) {
return;
}
@@ -52,8 +52,8 @@ public class AbilityDisableTask extends BukkitRunnable {
EventUtils.callAbilityDeactivateEvent(player, ability);
mcMMOPlayer.setAbilityMode(ability, false);
mcMMOPlayer.setAbilityInformed(ability, false);
mcMMOPlayer.getSuperAbilityManager().setAbilityMode(ability, false);
mcMMOPlayer.getSuperAbilityManager().setAbilityInformed(ability, false);
ParticleEffectUtils.playAbilityDisabledEffect(player);

4
src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java
View File

@@ -18,11 +18,11 @@ public class ToolLowerTask extends BukkitRunnable {
@Override
public void run() {
if (!mcMMOPlayer.getToolPreparationMode(tool)) {
if (!mcMMOPlayer.getSuperAbilityManager().getToolPreparationMode(tool)) {
return;
}
mcMMOPlayer.setToolPreparationMode(tool, false);
mcMMOPlayer.getSuperAbilityManager().setToolPreparationMode(tool, false);
if (Config.getInstance().getAbilityMessagesEnabled()) {
NotificationManager.sendPlayerInformation(mcMMOPlayer.getPlayer(), NotificationType.TOOL, tool.getLowerTool());