Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed issue #820 about skills not being locked when reallocating skill tree.

Browse Source
This commit is contained in:
Ka0rX 2023-05-07 15:11:20 +01:00
parent 13440600a8
commit aa6a1d7101
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,6 +377,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
*/ */
public boolean unlock(Unlockable unlockable) { public boolean unlock(Unlockable unlockable) {
Validate.isTrue(!unlockable.isUnlockedByDefault(), "Cannot unlock an item unlocked by default"); Validate.isTrue(!unlockable.isUnlockedByDefault(), "Cannot unlock an item unlocked by default");
unlockable.whenUnlocked(this);
final boolean wasLocked = unlockedItems.add(unlockable.getUnlockNamespacedKey()); final boolean wasLocked = unlockedItems.add(unlockable.getUnlockNamespacedKey());
// Call the event synchronously // Call the event synchronously
if (wasLocked) if (wasLocked)
@ -392,6 +393,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
*/ */
public boolean lock(Unlockable unlockable) { public boolean lock(Unlockable unlockable) {
Validate.isTrue(!unlockable.isUnlockedByDefault(), "Cannot lock an item unlocked by default"); Validate.isTrue(!unlockable.isUnlockedByDefault(), "Cannot lock an item unlocked by default");
unlockable.whenLocked(this);
boolean wasUnlocked = unlockedItems.remove(unlockable.getUnlockNamespacedKey()); boolean wasUnlocked = unlockedItems.remove(unlockable.getUnlockNamespacedKey());
if (wasUnlocked) if (wasUnlocked)
//Calls the event synchronously //Calls the event synchronously

2
MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/ClassSkill.java
View File

@ -87,7 +87,7 @@ public class ClassSkill implements CooldownObject, Unlockable {
@Override @Override
public void whenLocked(PlayerData playerData) { public void whenLocked(PlayerData playerData) {
playerData.mapBoundSkills().forEach((slot, skill) -> { playerData.mapBoundSkills().forEach((slot, skill) -> {
if (skill.equals(getUnlockNamespacedKey().split(":")[1])) if (skill.equalsIgnoreCase(getUnlockNamespacedKey().split(":")[1]))
playerData.unbindSkill(slot); playerData.unbindSkill(slot);
}); });
} }