Add debug statement to forwardingNPCHolder

CitizensDev · Mar 31, 2021 · 48a2763 · 48a2763
1 parent fa0cf4f
commit 48a2763
Showing 1 changed file with 9 additions and 1 deletion.
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
@@ -3,11 +3,19 @@
 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();
     }
 }