Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-01 15:03:36 +01:00
Code Issues Projects Releases Wiki Activity

Remove AbilityType references causing Import error

Browse Source 
Removed AbilityType else statement. Added additional check in CheckmcMMO() to confirm class com.gmail.nossr50.datatypes.skills.superabilitytype exists in try.
This commit is contained in:
Josiah Jones 2019-03-07 13:35:31 -06:00 committed by GitHub
parent 2df210d4aa
commit 2f996320e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/gamingmesh/jobs/McMMO/McMMOManager.java
View File

@ -48,27 +48,6 @@ public class McMMOManager {
return -(1 - Jobs.getGCManager().superBreakerMultiplier); return -(1 - Jobs.getGCManager().superBreakerMultiplier);
InfoMap.remove(SuperAbilityType.SUPER_BREAKER); 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; return 0D;
@ -79,6 +58,7 @@ public class McMMOManager {
if (McMMO != null) { if (McMMO != null) {
try { try {
Class.forName("com.gmail.nossr50.api.AbilityAPI"); Class.forName("com.gmail.nossr50.api.AbilityAPI");
Class.forName("com.gmail.nossr50.datatypes.skills.SuperAbilityType");
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
// Disabling skill API check; // Disabling skill API check;
mcMMOPresent = false; mcMMOPresent = false;