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

reworking party code

Browse Source
This commit is contained in:
nossr50
2020-09-30 13:04:35 -07:00
parent e057dfc482
commit 9e450adb0b
8 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/util/EventUtils.java
View File

@@ -1,6 +1,5 @@
package com.gmail.nossr50.util;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
@@ -202,7 +201,7 @@ public class EventUtils {
if (isCancelled) {
PlayerProfile profile = mcMMO.getUserManager().getPlayer(player);
profile.modifySkill(skill, profile.getSkillLevel(skill) - (isLevelUp ? levelsChanged : -levelsChanged));
profile.getExperienceManager().setSkillLevel(skill, profile.getSkillLevel(skill) - (isLevelUp ? levelsChanged : -levelsChanged));
profile.addXp(skill, xpRemoved);
}

11
src/main/java/com/gmail/nossr50/util/HardcoreManager.java
View File

@@ -4,6 +4,7 @@ import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.PlayerProfile;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.player.NotificationManager;
import com.gmail.nossr50.worldguard.WorldGuardManager;
import com.gmail.nossr50.worldguard.WorldGuardUtils;
@@ -40,8 +41,8 @@ public final class HardcoreManager {
continue;
}
int playerSkillLevel = playerProfile.getSkillLevel(primarySkillType);
int playerSkillXpLevel = playerProfile.getSkillXpLevel(primarySkillType);
int playerSkillLevel = playerProfile.getExperienceManager().getSkillLevel(primarySkillType);
int playerSkillXpLevel = playerProfile.getExperienceManager().getSkillXpValue(primarySkillType);
if (playerSkillLevel <= 0 || playerSkillLevel <= levelThreshold) {
levelChanged.put(primarySkillType.toString(), 0);
@@ -92,8 +93,8 @@ public final class HardcoreManager {
continue;
}
int killerSkillLevel = killerProfile.getSkillLevel(primarySkillType);
int victimSkillLevel = victimProfile.getSkillLevel(primarySkillType);
int killerSkillLevel = killerProfile.getExperienceManager().getSkillLevel(primarySkillType);
int victimSkillLevel = victimProfile.getExperienceManager().getSkillLevel(primarySkillType);
if (victimSkillLevel <= 0 || victimSkillLevel < killerSkillLevel / 2 || victimSkillLevel <= levelThreshold) {
levelChanged.put(primarySkillType.toString(), 0);
@@ -101,7 +102,7 @@ public final class HardcoreManager {
continue;
}
int victimSkillXpLevel = victimProfile.getSkillXpLevel(primarySkillType);
int victimSkillXpLevel = victimProfile.getExperienceManager().getSkillXpValue(primarySkillType);
double statsStolen = victimSkillLevel * (vampirismStatLeechPercentage * 0.01D);
int levelsStolen = (int) statsStolen;

2
src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java
View File

@@ -446,7 +446,7 @@ public class ScoreboardWrapper {
Validate.notNull(targetSkill);
if (!targetSkill.isChildSkill()) {
int currentXP = mmoPlayer.getExperienceManager().getSkillXpLevel(targetSkill);
int currentXP = mmoPlayer.getExperienceManager().getSkillXpValue(targetSkill);
sidebarObjective.getScore(ScoreboardManager.LABEL_CURRENT_XP).setScore(currentXP);
sidebarObjective.getScore(ScoreboardManager.LABEL_REMAINING_XP).setScore(mmoPlayer.getExperienceManager().getXpToLevel(targetSkill) - currentXP);