diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java index 841a8dc7e..41e288c5b 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java @@ -240,7 +240,7 @@ public class AbilityCharge extends Ability { @Override public float getTelegraphWidth() { - return hitRadius * 2; + return hitWidth * 2; } /** diff --git a/src/main/java/noppes/npcs/controllers/ScriptHookController.java b/src/main/java/noppes/npcs/controllers/ScriptHookController.java index 0264fe5c8..0a64be83c 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptHookController.java +++ b/src/main/java/noppes/npcs/controllers/ScriptHookController.java @@ -33,7 +33,6 @@ public class ScriptHookController implements IScriptHookHandler { CONTEXT_ITEM, CONTEXT_LINKED_ITEM, CONTEXT_FORGE, - CONTEXT_GLOBAL_NPC, CONTEXT_RECIPE, CONTEXT_EFFECT }; @@ -77,27 +76,6 @@ public class ScriptHookController implements IScriptHookHandler { EnumScriptType.ABILITY_COMPLETE.function ); - // Global NPC hooks (same as NPC) - registerBuiltIn(CONTEXT_GLOBAL_NPC, - EnumScriptType.INIT.function, - EnumScriptType.TICK.function, - EnumScriptType.INTERACT.function, - EnumScriptType.DIALOG.function, - EnumScriptType.DAMAGED.function, - EnumScriptType.KILLED.function, - EnumScriptType.ATTACK_MELEE.function, - EnumScriptType.ATTACK_SWING.function, - EnumScriptType.RANGED_LAUNCHED.function, - EnumScriptType.TARGET.function, - EnumScriptType.COLLIDE.function, - EnumScriptType.KILLS.function, - EnumScriptType.DIALOG_CLOSE.function, - EnumScriptType.TIMER.function, - EnumScriptType.TARGET_LOST.function, - EnumScriptType.PROJECTILE_TICK.function, - EnumScriptType.PROJECTILE_IMPACT.function - ); - // Player hooks registerBuiltIn(CONTEXT_PLAYER, EnumScriptType.INIT.function,