From fae2c21893f45651c90ad5ce8f5d6d990646dde8 Mon Sep 17 00:00:00 2001
From: KAMKEEL <28842281+KAMKEEL@users.noreply.github.com>
Date: Tue, 11 Aug 2026 12:18:59 -0400
Subject: [PATCH] Fix the script-facing effect apply and remove overloads
 throwing on every call

---
 .../npcs/controllers/CustomEffectController.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
index 6a465b0ee..eec64107d 100644
--- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java
+++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
@@ -543,7 +543,9 @@ public class CustomEffectController implements ICustomEffectHandler {
 
     @Override
     public void applyEffect(IPlayer player, ICustomEffect effect, int duration, byte level) {
-        applyEffect(player, effect.getID(), duration, level);
+        if (effect == null)
+            return;
+        applyEffect(player, effect.getID(), duration, level, effect.getIndex());
     }
 
     @Override
@@ -555,14 +557,16 @@ public class CustomEffectController implements ICustomEffectHandler {
 
     @Override
     public void removeEffect(IPlayer player, ICustomEffect effect) {
-        removeEffect((EntityPlayer) player.getMCEntity(), (PlayerEffect) effect, ExpirationType.REMOVED);
+        if (effect == null)
+            return;
+        removeEffect(player, effect.getID(), effect.getIndex());
     }
 
     @Override
     public void clearEffects(IPlayer player) {
         if (player == null || player.getMCEntity() == null)
             return;
-        clearEffects((EntityPlayer) player);
+        clearEffects((EntityPlayer) player.getMCEntity());
     }
 
     @Override