diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/ForwardingNPCHolder.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/ForwardingNPCHolder.java index d7f3cec4b..3333550bd 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/ForwardingNPCHolder.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/ForwardingNPCHolder.java @@ -3,11 +3,19 @@ package net.citizensnpcs.nms.v1_16_R3.util; import org.bukkit.entity.Entity; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.util.Messaging; import net.citizensnpcs.npc.ai.NPCHolder; public interface ForwardingNPCHolder extends NPCHolder, Entity { @Override default NPC getNPC() { - return ((NPCHolder) NMSImpl.getHandle(this)).getNPC(); + net.minecraft.server.v1_16_R3.Entity handle = NMSImpl.getHandle(this); + if (!(handle instanceof NPCHolder)) { + if (Messaging.isDebugging()) { + Messaging.debug("ForwardingNPCHolder with an improper bukkit entity", this, handle); + } + return null; + } + return ((NPCHolder) handle).getNPC(); } }