From a328a635d7704ea5d4427e57746f8ade7db63193 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 27 Feb 2025 15:25:05 -0500 Subject: [PATCH] Attribute Command Fix and Conditional Enabling --- .../java/kamkeel/npcs/command/AttributeCommand.java | 10 +++++----- src/main/java/kamkeel/npcs/command/CommandKamkeel.java | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/kamkeel/npcs/command/AttributeCommand.java b/src/main/java/kamkeel/npcs/command/AttributeCommand.java index 9e41386f9..ed4e98561 100644 --- a/src/main/java/kamkeel/npcs/command/AttributeCommand.java +++ b/src/main/java/kamkeel/npcs/command/AttributeCommand.java @@ -108,13 +108,13 @@ public class AttributeCommand extends CommandKamkeelBase { // Check if this is a magic attribute. if(def.getValueType() == AttributeValueType.MAGIC) { if(args.length < 3){ - sendError(sender, "Usage for magic attribute: apply "); + sendError(sender, "Usage for magic attribute: apply "); return; } int magicId; - double value; + float value; try { - value = Double.parseDouble(args[1]); + value = Float.parseFloat(args[1]); magicId = Integer.parseInt(args[2]); } catch(NumberFormatException e) { sendError(sender, "Invalid number format for magicID or value."); @@ -133,9 +133,9 @@ public class AttributeCommand extends CommandKamkeelBase { sendError(sender, "Usage: "); return; } - double value; + float value; try { - value = Double.parseDouble(args[1]); + value = Float.parseFloat(args[1]); } catch(NumberFormatException e) { sendError(sender, "Invalid number format for value."); return; diff --git a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java index 67d7e7288..bdf214769 100644 --- a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java +++ b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java @@ -8,6 +8,7 @@ import net.minecraft.server.MinecraftServer; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.attribute.AttributeController; import noppes.npcs.attribute.AttributeDefinition; +import noppes.npcs.config.ConfigMain; import noppes.npcs.scripted.CustomNPCsException; import java.lang.reflect.Method; @@ -35,7 +36,8 @@ public class CommandKamkeel extends CommandBase{ registerCommand(new OverlayCommand()); registerCommand(new CommandCommand()); registerCommand(new EffectCommand()); - registerCommand(new AttributeCommand()); + if(ConfigMain.AttributesEnabled) + registerCommand(new AttributeCommand()); } public void registerCommand(CommandKamkeelBase command){