From 2f996320e1caae4fcfc1ea77be8b435610862235 Mon Sep 17 00:00:00 2001 From: Josiah Jones Date: Thu, 7 Mar 2019 13:35:31 -0600 Subject: [PATCH] Remove AbilityType references causing Import error Removed AbilityType else statement. Added additional check in CheckmcMMO() to confirm class com.gmail.nossr50.datatypes.skills.superabilitytype exists in try. --- .../gamingmesh/jobs/McMMO/McMMOManager.java | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/McMMO/McMMOManager.java b/src/main/java/com/gamingmesh/jobs/McMMO/McMMOManager.java index 80b95b5d..9e963dc7 100644 --- a/src/main/java/com/gamingmesh/jobs/McMMO/McMMOManager.java +++ b/src/main/java/com/gamingmesh/jobs/McMMO/McMMOManager.java @@ -48,27 +48,6 @@ public class McMMOManager { return -(1 - Jobs.getGCManager().superBreakerMultiplier); InfoMap.remove(SuperAbilityType.SUPER_BREAKER); } - } else { //Don't report errors if using pre-overhaul mcmmo - Long t = InfoMap.get(AbilityType.TREE_FELLER); - if (t != null) { - if (t < System.currentTimeMillis()) - return -(1 - Jobs.getGCManager().TreeFellerMultiplier); - InfoMap.remove(AbilityType.TREE_FELLER); - } - - t = InfoMap.get(AbilityType.GIGA_DRILL_BREAKER); - if (t != null) { - if (t < System.currentTimeMillis()) - return -(1 - Jobs.getGCManager().gigaDrillMultiplier); - InfoMap.remove(AbilityType.GIGA_DRILL_BREAKER); - } - - t = InfoMap.get(AbilityType.SUPER_BREAKER); - if (t != null) { - if (t < System.currentTimeMillis()) - return -(1 - Jobs.getGCManager().superBreakerMultiplier); - InfoMap.remove(AbilityType.SUPER_BREAKER); - } } return 0D; @@ -79,6 +58,7 @@ public class McMMOManager { if (McMMO != null) { try { Class.forName("com.gmail.nossr50.api.AbilityAPI"); + Class.forName("com.gmail.nossr50.datatypes.skills.SuperAbilityType"); } catch (ClassNotFoundException e) { // Disabling skill API check; mcMMOPresent = false;