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

More work on skill API impl/migration

Browse Source
This commit is contained in:
nossr50
2020-12-24 16:41:09 -08:00
parent 9b9ffbb982
commit 21ac44ee61
12 changed files with 205 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/util/experience/MMOExperienceBarManager.java
View File

@@ -182,7 +182,7 @@ public class MMOExperienceBarManager {
}
public static void setBarStateDefaults(@NotNull Map<RootSkill, SkillBossBarState> barStateHashMap) {
for(RootSkill rootSkill : CoreSkills.getCoreSkills()) {
for(RootSkill rootSkill : CoreSkills.getCoreRootSkills()) {
if(CoreSkills.isChildSkill(rootSkill)) {
barStateHashMap.put(rootSkill, SkillBossBarState.DISABLED);

10
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@@ -14,10 +14,10 @@ import com.gmail.nossr50.runnables.skills.AwardCombatXpTask;
import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
import com.gmail.nossr50.skills.archery.ArcheryManager;
import com.gmail.nossr50.skills.axes.AxesManager;
import com.gmail.nossr50.skills.crossbows.CrossbowManager;
import com.gmail.nossr50.skills.crossbows.CrossbowsManager;
import com.gmail.nossr50.skills.swords.SwordsManager;
import com.gmail.nossr50.skills.taming.TamingManager;
import com.gmail.nossr50.skills.tridents.TridentManager;
import com.gmail.nossr50.skills.tridents.TridentsManager;
import com.gmail.nossr50.skills.unarmed.UnarmedManager;
import com.gmail.nossr50.util.*;
import com.gmail.nossr50.util.compat.layers.persistentdata.AbstractPersistentDataLayer;
@@ -131,7 +131,7 @@ public final class CombatUtils {
return;
}
TridentManager tridentManager = ((McMMOPlayer) (mmoPlayer)).getTridentManager();
TridentsManager tridentsManager = ((McMMOPlayer) (mmoPlayer)).getTridentManager();
// double initialDamage = entityDamageByEntityEvent.getDamage();
// double finalDamage = initialDamage;
@@ -340,7 +340,7 @@ public final class CombatUtils {
return;
}
CrossbowManager crossbowManager = ((McMMOPlayer) (mmoPlayer)).getCrossbowManager();
CrossbowsManager crossbowsManager = ((McMMOPlayer) (mmoPlayer)).getCrossbowManager();
double finalDamage = event.getDamage();
@@ -361,7 +361,7 @@ public final class CombatUtils {
finalDamage+=getLimitBreakDamage(mmoPlayer, target, SubSkillType.CROSSBOWS_CROSSBOWS_LIMIT_BREAK);
}
double distanceMultiplier = crossbowManager.distanceXpBonusMultiplier(target, arrow);
double distanceMultiplier = crossbowsManager.distanceXpBonusMultiplier(target, arrow);
applyScaledModifiers(initialDamage, finalDamage, event);