From 61d08882a9987410ff9c3d3a66b04742bdd84935 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 1 Mar 2026 16:19:50 -0500 Subject: [PATCH] Lots of Fixes --- .../npcs/controllers/AbilityController.java | 10 ++++++---- .../controllers/data/ability/Ability.java | 4 ++-- .../data/ability/AbilityAction.java | 1 + .../data/ability/CustomAbility.java | 2 +- .../ability/conditions/ConditionHitCount.java | 4 ++-- .../ability/conditions/ConditionItem.java | 2 +- .../conditions/ConditionQuestCompleted.java | 4 +++- .../data/ability/data/ChainedAbility.java | 20 +++++++++++++++---- .../npcs/entity/EntityAbilityBeam.java | 1 - .../npcs/entity/EntityAbilityLaser.java | 6 ++---- .../npcs/entity/EntityAbilityZone.java | 3 ++- .../npcs/entity/EntityEnergyProjectile.java | 2 -- .../data/ability/AbilityHotbarSyncPacket.java | 4 ++++ .../ability/AbilityHotbarSavePacket.java | 5 +++++ .../ability/CustomAbilitySavePacket.java | 1 + .../request/script/AbilityScriptPacket.java | 4 +++- .../script/ChainedAbilityScriptPacket.java | 4 +++- .../gui/advanced/SubGuiAbilityConfig.java | 2 +- .../npcs/client/gui/builder/FieldDef.java | 2 +- .../npcs/scripted/entity/ScriptEnergyOrb.java | 1 + 20 files changed, 55 insertions(+), 27 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/AbilityController.java b/src/main/java/kamkeel/npcs/controllers/AbilityController.java index 7acfc96a9..7840621f7 100644 --- a/src/main/java/kamkeel/npcs/controllers/AbilityController.java +++ b/src/main/java/kamkeel/npcs/controllers/AbilityController.java @@ -395,7 +395,8 @@ public class AbilityController implements IAbilityHandler { // Clean up online players' unlocked ability lists if (PlayerDataController.Instance != null) { - for (PlayerData pData : PlayerDataController.Instance.getAllPlayerData()) { + List snapshot = new ArrayList<>(PlayerDataController.Instance.getAllPlayerData()); + for (PlayerData pData : snapshot) { if (pData.abilityData != null) { boolean changed = false; if (uuid != null && !uuid.isEmpty() && pData.abilityData.hasUnlockedAbility(uuid)) { @@ -437,7 +438,7 @@ public class AbilityController implements IAbilityHandler { return customAbilities; } - public void setCustomAbilities(Map synced) { + public synchronized void setCustomAbilities(Map synced) { customAbilities.clear(); customAbilitiesById.clear(); customAbilities.putAll(synced); @@ -613,7 +614,8 @@ public class AbilityController implements IAbilityHandler { // Clean up online players' unlocked ability lists (chain keys use "chain:" prefix) if (PlayerDataController.Instance != null) { - for (PlayerData pData : PlayerDataController.Instance.getAllPlayerData()) { + List snapshot = new ArrayList<>(PlayerDataController.Instance.getAllPlayerData()); + for (PlayerData pData : snapshot) { if (pData.abilityData != null) { String chainKey = "chain:" + (uuid != null && !uuid.isEmpty() ? uuid : name); if (pData.abilityData.hasUnlockedAbility(chainKey)) { @@ -722,7 +724,7 @@ public class AbilityController implements IAbilityHandler { return chainedAbilityRevision; } - public void setChainedAbilities(Map synced) { + public synchronized void setChainedAbilities(Map synced) { chainedAbilities.clear(); chainedAbilitiesById.clear(); chainedAbilities.putAll(synced); diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java index 0b78a5b2f..70e286298 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java @@ -1531,7 +1531,7 @@ public abstract class Ability implements IAbility, IAbilityAction { dazedAnimationId = nbt.hasKey("dazedAnimationId") ? nbt.getInteger("dazedAnimationId") : -1; windUpAnimationName = nbt.getString("windUpAnimationName"); activeAnimationName = nbt.getString("activeAnimationName"); - dazedAnimationName = nbt.getString("dazedAnimationName"); + dazedAnimationName = nbt.hasKey("dazedAnimationName") ? nbt.getString("dazedAnimationName") : "Ability_Generic_Dazed"; showTelegraph = nbt.hasKey("showTelegraph") ? nbt.getBoolean("showTelegraph") : true; try { telegraphType = TelegraphType.valueOf(nbt.getString("telegraphType")); @@ -2356,7 +2356,7 @@ public abstract class Ability implements IAbility, IAbilityAction { } // ═══════════════════════════════════════════════════════════════════ - // SHIT FROM THE ASS + // WINDUP DURATION CALCULATION // ═══════════════════════════════════════════════════════════════════ private int calculateWindupFromAnimation() { diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java index 571b2fd35..5c156a056 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java @@ -308,6 +308,7 @@ public class AbilityAction { } // Inline ability + if (AbilityController.Instance == null) return null; Ability ability = AbilityController.Instance.fromNBT(nbt); if (ability == null) return null; return inline(ability); diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/CustomAbility.java b/src/main/java/kamkeel/npcs/controllers/data/ability/CustomAbility.java index c59eb9765..045a12e5d 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/CustomAbility.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/CustomAbility.java @@ -126,7 +126,7 @@ public class CustomAbility extends Ability implements ICustomAbility { @Override public void readTypeNBT(NBTTagCompound nbt) { - this.durationTicks = nbt.getInteger("durationTicks"); + this.durationTicks = Math.max(0, nbt.getInteger("durationTicks")); } // ==================== GUI ==================== diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionHitCount.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionHitCount.java index 5d02d51a7..f94d465e1 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionHitCount.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionHitCount.java @@ -76,7 +76,7 @@ public class ConditionHitCount extends AbilityCondition { @Override public void readTypeNBT(NBTTagCompound nbt) { - requiredHits = nbt.getInteger("requiredHits"); - withinTicks = nbt.getInteger("withinTicks"); + requiredHits = Math.max(0, nbt.getInteger("requiredHits")); + withinTicks = Math.max(0, nbt.getInteger("withinTicks")); } } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java index 552bb5de9..221a68f63 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionItem.java @@ -174,7 +174,7 @@ public class ConditionItem extends AbilityCondition { itemName = nbt.getString("itemName"); usageType = UsageType.fromOrdinal(nbt.getInteger("usageType")); armorSlot = ArmorSlot.fromOrdinal(nbt.getInteger("armorSlot")); - requiredCount = nbt.getInteger("requiredCount"); + requiredCount = Math.max(1, nbt.getInteger("requiredCount")); } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionQuestCompleted.java b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionQuestCompleted.java index 263cd28af..2955b7610 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionQuestCompleted.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/conditions/ConditionQuestCompleted.java @@ -30,7 +30,9 @@ public class ConditionQuestCompleted extends AbilityCondition { if (questId < 0) return false; EntityPlayer player = (EntityPlayer) entity; - return PlayerData.get(player).questData.hasFinishedQuest(questId); + PlayerData data = PlayerData.get(player); + if (data == null || data.questData == null) return false; + return data.questData.hasFinishedQuest(questId); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java index e3aa63346..cfc90d38f 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java @@ -289,9 +289,15 @@ public class ChainedAbility implements IChainedAbility, IAbilityAction { */ public boolean checkConditions(EntityLivingBase caster, EntityLivingBase target) { for (AbilityCondition c : conditions) { - if (!c.check(caster, target)) { - return false; + if (!c.getUserType().allowsNpc()) continue; + Boolean extendedCondition = AbilityController.Instance.fireCheckConditions(c, caster, target); + + if (extendedCondition != null) { + if (!extendedCondition) return false; + continue; } + + if (!c.check(caster, target)) return false; } return true; } @@ -301,10 +307,16 @@ public class ChainedAbility implements IChainedAbility, IAbilityAction { */ public boolean checkConditionsForPlayer(EntityLivingBase caster) { for (AbilityCondition c : conditions) { + if (!c.getUserType().allowsPlayer()) continue; if (c.requiresTarget()) continue; - if (!c.check(caster, null)) { - return false; + Boolean extendedCondition = AbilityController.Instance.fireCheckConditionsForPlayer(c, caster); + + if (extendedCondition != null) { + if (!extendedCondition) return false; + continue; } + + if (!c.check(caster, null)) return false; } return true; } diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java index 15b1e5cbf..7744fcd27 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityBeam.java @@ -809,7 +809,6 @@ public class EntityAbilityBeam extends EntityEnergyProjectile { nbt.setDouble("HeadOffsetY", headOffsetY); nbt.setDouble("HeadOffsetZ", headOffsetZ); nbt.setBoolean("AttachedToOwner", isAnchoredMode()); - nbt.setBoolean("RenderTailOrb", isAnchoredMode()); nbt.setString("BeamMode", beamMode.name()); writeChargingNBT(nbt); nbt.setFloat("ChargeOffsetDistance", chargeOffsetDistance); diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java index 4581340a9..e84e0df00 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityLaser.java @@ -779,10 +779,8 @@ public class EntityAbilityLaser extends EntityEnergyProjectile { @Override protected void readProjectileNBT(NBTTagCompound nbt) { this.laserWidth = sanitize(nbt.hasKey("LaserWidth") ? nbt.getFloat("LaserWidth") : 0.2f, 0.2f, MAX_ENTITY_SIZE); - this.expansionSpeed = nbt.hasKey("ExpansionSpeed") ? nbt.getFloat("ExpansionSpeed") : 2.0f; - if (Float.isNaN(expansionSpeed) || Float.isInfinite(expansionSpeed) || expansionSpeed <= 0) expansionSpeed = 2.0f; - this.maxLength = nbt.hasKey("MaxLength") ? nbt.getFloat("MaxLength") : 32.0f; - if (Float.isNaN(maxLength) || Float.isInfinite(maxLength) || maxLength <= 0) maxLength = 32.0f; + this.expansionSpeed = sanitize(nbt.hasKey("ExpansionSpeed") ? nbt.getFloat("ExpansionSpeed") : 2.0f, 0.1f, MAX_ENTITY_SIZE); + this.maxLength = sanitize(nbt.hasKey("MaxLength") ? nbt.getFloat("MaxLength") : 32.0f, 1.0f, MAX_ENTITY_SIZE); this.dirX = nbt.getDouble("DirX"); this.dirY = nbt.getDouble("DirY"); this.dirZ = nbt.getDouble("DirZ"); diff --git a/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java b/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java index a3c034fcb..4d83945e4 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java +++ b/src/main/java/kamkeel/npcs/entity/EntityAbilityZone.java @@ -790,7 +790,8 @@ public class EntityAbilityZone extends Entity implements IEntityAdditionalSpawnD this.shape = ZoneShape.CIRCLE; } this.ownerEntityId = buffer.readInt(); - this.radius = buffer.readFloat(); + this.radius = Math.max(0.1f, Math.min(100.0f, buffer.readFloat())); + if (Float.isNaN(radius) || Float.isInfinite(radius)) radius = 5.0f; this.durationTicks = buffer.readInt(); this.maxTicks = buffer.readInt(); this.innerColor = buffer.readInt(); diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java index bba50a69d..59dd346e4 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java @@ -116,8 +116,6 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { // ==================== HOMING PROPERTIES ==================== protected EnergyHomingData homingData = new EnergyHomingData(); - protected Map pathDelays; - // ==================== TRACKING ==================== protected double startX, startY, startZ; protected int targetEntityId = -1; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ability/AbilityHotbarSyncPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ability/AbilityHotbarSyncPacket.java index a30682ecc..7ce46f97b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ability/AbilityHotbarSyncPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ability/AbilityHotbarSyncPacket.java @@ -81,6 +81,10 @@ public final class AbilityHotbarSyncPacket extends AbstractPacket { if (valid && data.abilityData != null) { valid = data.abilityData.hasUnlockedAbility(slot.abilityKey); + // For chains, also check with resolved key in case key format differs + if (!valid && slot.isChainKey()) { + valid = data.abilityData.hasUnlockedAbility("chain:" + slot.getResolveKey()); + } } if (!valid) { diff --git a/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSavePacket.java index 1522763fc..687a00a1f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/ability/AbilityHotbarSavePacket.java @@ -51,6 +51,7 @@ public final class AbilityHotbarSavePacket extends AbstractPacket { public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { int slot = in.readInt(); NBTTagCompound compound = ByteBufUtils.readNBT(in); + if (compound == null) return; if (slot < 0 || slot >= AbilityHotbarData.TOTAL_SLOTS) return; @@ -73,6 +74,10 @@ public final class AbilityHotbarSavePacket extends AbstractPacket { if (valid && data.abilityData != null) { valid = data.abilityData.hasUnlockedAbility(slotData.abilityKey); + // For chains, also check with resolved key in case key format differs + if (!valid && slotData.isChainKey()) { + valid = data.abilityData.hasUnlockedAbility("chain:" + slotData.getResolveKey()); + } } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/ability/CustomAbilitySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/ability/CustomAbilitySavePacket.java index 3d91f5a86..8c075bb25 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/ability/CustomAbilitySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/ability/CustomAbilitySavePacket.java @@ -66,6 +66,7 @@ public final class CustomAbilitySavePacket extends AbstractPacket { return; NBTTagCompound compound = ByteBufUtils.readNBT(in); + if (compound == null) return; Ability ability = AbilityController.Instance.fromNBT(compound); if (ability != null) { AbilityController.Instance.saveCustomAbility(ability); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/AbilityScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/AbilityScriptPacket.java index 411d98a00..ec3f6ff20 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/AbilityScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/AbilityScriptPacket.java @@ -81,7 +81,9 @@ public final class AbilityScriptPacket extends AbstractPacket { if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) return; - Action requestedAction = Action.values()[in.readInt()]; + int actionOrd = in.readInt(); + if (actionOrd < 0 || actionOrd >= Action.values().length) return; + Action requestedAction = Action.values()[actionOrd]; String id = ByteBufUtils.readUTF8String(in); Ability ability = AbilityController.Instance.resolveAbility(id); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ChainedAbilityScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ChainedAbilityScriptPacket.java index 2589b0e13..45640bbfb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ChainedAbilityScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ChainedAbilityScriptPacket.java @@ -81,7 +81,9 @@ public final class ChainedAbilityScriptPacket extends AbstractPacket { if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) return; - Action requestedAction = Action.values()[in.readInt()]; + int actionOrd = in.readInt(); + if (actionOrd < 0 || actionOrd >= Action.values().length) return; + Action requestedAction = Action.values()[actionOrd]; String id = ByteBufUtils.readUTF8String(in); ChainedAbility chain = AbilityController.Instance.resolveChainedAbility(id); diff --git a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java index 5b56d0f14..485d59b87 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/SubGuiAbilityConfig.java @@ -268,7 +268,7 @@ public class SubGuiAbilityConfig extends SubGuiInterface implements ITextfieldLi } if (conditions.size() < MAX_CONDITIONS) { - sw.addButton(new GuiNpcButton(BTN_ADD_COND, L_LABEL_X, y, 50, 20, "gui.add"));; + sw.addButton(new GuiNpcButton(BTN_ADD_COND, L_LABEL_X, y, 50, 20, "gui.add")); y += ROW_H; } diff --git a/src/main/java/noppes/npcs/client/gui/builder/FieldDef.java b/src/main/java/noppes/npcs/client/gui/builder/FieldDef.java index fe3267112..4d03cb2dc 100644 --- a/src/main/java/noppes/npcs/client/gui/builder/FieldDef.java +++ b/src/main/java/noppes/npcs/client/gui/builder/FieldDef.java @@ -309,7 +309,7 @@ public class FieldDef { } public boolean hasRange() { - return min != Float.NEGATIVE_INFINITY || max != Float.POSITIVE_INFINITY; + return min != 0 || max != Float.POSITIVE_INFINITY; } public Class> getEnumClass() { diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyOrb.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyOrb.java index 1b6a95fb7..cb47a092c 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyOrb.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEnergyOrb.java @@ -49,5 +49,6 @@ public class ScriptEnergyOrb extends ScriptEnergyPro entity.motionY = (dy / len) * entity.getSpeed(); entity.motionZ = (dz / len) * entity.getSpeed(); } + entity.startMoving(null); } }