Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2025-11-18 06:24:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed max level cap not working for professions and main class

Browse Source
This commit is contained in:
Jules 2025-10-21 00:05:03 +02:00
parent 6debce3af9
commit 54e6d0cc38
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -497,7 +497,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
/**
* @return If the item is unlocked by the player
* This is used for skills that can be locked & unlocked.
* This is used for skills that can be locked & unlocked.
*/
public boolean hasUnlocked(Unlockable unlockable) {
return unlockable.isUnlockedByDefault() || unlockedItems.contains(unlockable.getUnlockNamespacedKey());
@ -606,6 +606,8 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
@Override
public int getLevel() {
// Level 0 does not exist
// Watch out for raw accesses of #level
return Math.max(1, level);
}
@ -669,7 +671,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
/**
* @param key The identifier of an exp table item.
* @return Amount of times an item has been claimed
* inside an experience table.
* inside an experience table.
*/
public int getClaims(@NotNull String key) {
return tableItemClaims.getOrDefault(key, 0);
@ -706,17 +708,16 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
public void setLevel(int level, @NotNull PlayerLevelChangeEvent.Reason reason) {
final var oldLevel = this.level;
final var newLevel = Math.max(1, level);
final var oldLevel = getLevel();
var newLevel = Math.max(1, level);
if (getProfess().hasMaxLevel()) newLevel = Math.min(getProfess().getMaxLevel(), newLevel);
this.level = newLevel;
if (reason != PlayerLevelChangeEvent.Reason.CHOOSE_PROFILE) // No event, data is loaded async
Bukkit.getPluginManager().callEvent(new PlayerLevelChangeEvent(this, null, oldLevel, newLevel, reason));
if (getMMOPlayerData().isPlaying()) {
getStats().updateStats();
refreshVanillaExp();
}
if (getMMOPlayerData().isPlaying()) getStats().updateStats();
if (isOnline()) refreshVanillaExp();
}
public void giveLevels(int value, @NotNull EXPSource source) {
@ -1009,7 +1010,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
// Take exp on negative amounts
if (value <= 0) {
experience = Math.max(0, experience + value);
setExperience(experience + value);
return;
}
@ -1042,8 +1043,9 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
experience = Math.max(0, experience + event.getExperience());
// Calculate the player's next level
final var oldLevel = level;
var newLevel = level;
final var maxLevel = getProfess().getMaxLevel();
final var oldLevel = getLevel();
var newLevel = oldLevel;
long experienceNeeded;
/*
@ -1052,7 +1054,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
*/
while (experience >= (experienceNeeded = getProfess().getExpCurve().getExperience(newLevel + 1))) {
if (hasReachedMaxLevel()) {
if (maxLevel > 0 && newLevel >= maxLevel) {
experience = 0;
break;
}
@ -1066,7 +1068,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
if (newLevel > oldLevel) {
setLevel(newLevel, PlayerLevelChangeEvent.Reason.LEVEL_UP); // Update 'level'
Message.LEVEL_UP.send(this, "level", level);
Message.LEVEL_UP.send(this, "level", getLevel());
}
refreshVanillaExp();
@ -1134,7 +1136,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
/**
* @return If the PlayerEnterCastingModeEvent successfully put the player
* into casting mode, otherwise if the event is cancelled, returns false.
* into casting mode, otherwise if the event is cancelled, returns false.
*/
public boolean setSkillCasting() {
Validate.isTrue(!isCasting(), "Player already in casting mode");
@ -1153,7 +1155,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
/**
* @return If player successfully left skill casting i.e the Bukkit
* event has not been cancelled
* event has not been cancelled
*/
public boolean leaveSkillCasting() {
return leaveSkillCasting(false);
@ -1162,7 +1164,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
/**
* @param skipEvent Skip firing the exit event
* @return If player successfully left skill casting i.e the Bukkit
* event has not been cancelled
* event has not been cancelled
*/
public boolean leaveSkillCasting(boolean skipEvent) {
Validate.isTrue(isCasting(), "Player not in casting mode");
@ -1393,7 +1395,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
@Deprecated
public void takeLevels(int value) {
setLevel(level - value, PlayerLevelChangeEvent.Reason.UNKNOWN);
setLevel(getLevel() - value, PlayerLevelChangeEvent.Reason.UNKNOWN);
}
@Deprecated
@ -1550,7 +1552,7 @@ public class PlayerData extends SynchronizedDataHolder implements OfflinePlayerD
* checks if they could potentially upgrade to one of these
*
* @return If the player can change its current class to
* a subclass
* a subclass
*/
@Deprecated
public boolean canChooseSubclass() {

4
MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
View File

@ -300,6 +300,10 @@ public class PlayerClass implements ExperienceObject, PreloadedObject {
return maxLevel;
}
public boolean hasMaxLevel() {
return maxLevel > 0;
}
public int getDisplayOrder() {
return displayOrder;
}

8
MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java
View File

@ -133,6 +133,7 @@ public class PlayerProfessions {
}
public void setLevel(@NotNull Profession profession, int newLevel, @NotNull PlayerLevelChangeEvent.Reason reason) {
if (profession.hasMaxLevel()) newLevel = Math.min(profession.getMaxLevel(), newLevel);
final var previousValue = level.put(profession.getId(), Math.max(1, newLevel));
final var oldLevel = previousValue == null ? 1 : Math.max(1, previousValue);
@ -157,8 +158,8 @@ public class PlayerProfessions {
public void giveLevels(Profession profession, int value, EXPSource source) {
long equivalentExp = 0;
int level = getLevel(profession);
while (value-- > 0) equivalentExp += profession.getExpCurve().getExperience(level + value + 1);
final var currentLevel = getLevel(profession);
while (value-- > 0) equivalentExp += profession.getExpCurve().getExperience(currentLevel + value + 1);
giveExperience(profession, equivalentExp, source);
}
@ -202,6 +203,7 @@ public class PlayerProfessions {
if (hologramLocation != null && profession.getOption(Profession.ProfessionOption.EXP_HOLOGRAMS))
MMOCoreUtils.displayIndicator(hologramLocation.add(.5, 1.5, .5), Language.EXP_HOLOGRAM.getFormat().replace("{exp}", MythicLib.plugin.getMMOConfig().decimal.format(event.getExperience())));
final var maxLevel = profession.getMaxLevel();
var currentExp = Math.max(0d, exp.getOrDefault(profession.getId(), 0d) + event.getExperience());
final var oldLevel = getLevel(profession);
int newLevel = oldLevel;
@ -213,7 +215,7 @@ public class PlayerProfessions {
*/
while (currentExp >= (experienceNeeded = profession.getExpCurve().getExperience(newLevel))) {
if (hasReachedMaxLevel(profession)) {
if (maxLevel > 0 && newLevel >= maxLevel) {
currentExp = 0;
break;
}