Fix Some GUI Saving Bugs in Abilities and Chained Abilities

This commit is contained in:
Kam committed 2026-02-19 14:57:10 -05:00
1 parent 755a9313e4
commit a94219cd0d
5 files changed
+61 -43

No files matched your search

@@ -38,6 +38,8 @@ import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomNpcs;
import noppes.npcs.LogWriter;
import noppes.npcs.api.handler.IAbilityHandler;
import noppes.npcs.controllers.PlayerDataController;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.util.NBTJsonUtil;
import java.io.File;
@@ -376,6 +378,23 @@ public class AbilityController implements IAbilityHandler {
file.delete();
}
// Clean up online players' unlocked ability lists
if (PlayerDataController.Instance != null) {
for (PlayerData pData : PlayerDataController.Instance.getAllPlayerData()) {
if (pData.abilityData != null) {
boolean changed = false;
if (uuid != null && !uuid.isEmpty() && pData.abilityData.hasUnlockedAbility(uuid)) {
pData.abilityData.lockAbility(uuid);
changed = true;
}
if (pData.abilityData.hasUnlockedAbility(name)) {
pData.abilityData.lockAbility(name);
changed = true;
}
}
}
}
customAbilityRevision++;
LogWriter.info("Deleted custom ability: " + name);
SyncController.syncAllCustomAbilities();
@@ -542,6 +561,22 @@ public class AbilityController implements IAbilityHandler {
file.delete();
}
// Clean up online players' unlocked ability lists (chain keys use "chain:" prefix)
if (PlayerDataController.Instance != null) {
for (PlayerData pData : PlayerDataController.Instance.getAllPlayerData()) {
if (pData.abilityData != null) {
String chainKey = "chain:" + (uuid != null && !uuid.isEmpty() ? uuid : name);
if (pData.abilityData.hasUnlockedAbility(chainKey)) {
pData.abilityData.lockAbility(chainKey);
}
String chainNameKey = "chain:" + name;
if (!chainNameKey.equals(chainKey) && pData.abilityData.hasUnlockedAbility(chainNameKey)) {
pData.abilityData.lockAbility(chainNameKey);
}
}
}
}
chainedAbilityRevision++;
LogWriter.info("Deleted chained ability: " + name);
SyncController.syncAllChainedAbilities();