From 9700114d8772b0be744a9edfd5f5d759e1fa01ad Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Apr 2025 22:06:56 -0400 Subject: [PATCH] Beta 17 + Fix NPCs to Players with Magic Attributes --- build.gradle | 2 +- src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java | 6 +----- src/main/java/noppes/npcs/CustomNpcs.java | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 9bdbcb86a..25042091d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10-testingbeta16" +version = "1.10-testingbeta17" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java index 399d0457c..d7f48788f 100644 --- a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java +++ b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java @@ -204,11 +204,7 @@ public class AttributeAttackUtil { MagicController magicController = MagicController.getInstance(); Set defenderMagicIDs = new HashSet<>(defenderData.magicData.getMagics().keySet()); applyMagicInteractions(result.allocation, defenderMagicIDs, magicController); - - float adjustedMagic = 0f; - for (float val : result.allocation.values()) - adjustedMagic += val; - + float adjustedMagic = applyDefenderMagicDefense(result.allocation, defender, magicController); return leftover + adjustedMagic; } diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index fde66cafb..5f6b40e51 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -41,7 +41,7 @@ import noppes.npcs.scripted.NpcAPI; import java.io.File; import java.util.Set; -@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10-beta16") +@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10-beta17") public class CustomNpcs { @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy")