From be37dd9dd3bf0ff25dd2ef8262c7ded11e44529b Mon Sep 17 00:00:00 2001 From: Kam Date: Fri, 29 Mar 2024 01:36:23 -0400 Subject: [PATCH] Sanity Null Checks --- .../java/com/goodbird/npcgecko/handler/EventHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/goodbird/npcgecko/handler/EventHandler.java b/src/main/java/com/goodbird/npcgecko/handler/EventHandler.java index 67cf5b2..119baab 100644 --- a/src/main/java/com/goodbird/npcgecko/handler/EventHandler.java +++ b/src/main/java/com/goodbird/npcgecko/handler/EventHandler.java @@ -10,16 +10,19 @@ import noppes.npcs.scripted.event.NpcEvent; public class EventHandler { @SubscribeEvent public void onNpcMeleeAttack(NpcEvent.SwingEvent event){ - NetworkHandler.sendToAll(new CPacketSyncAutoAnim((EntityNPCInterface) event.npc.getMCEntity(), EnumSyncAutoAnim.MELEE_ATTACK)); + if(event != null && event.npc != null && event.npc.getMCEntity() != null) + NetworkHandler.sendToAll(new CPacketSyncAutoAnim((EntityNPCInterface) event.npc.getMCEntity(), EnumSyncAutoAnim.MELEE_ATTACK)); } @SubscribeEvent public void onNpcRanged(NpcEvent.RangedLaunchedEvent event){ - NetworkHandler.sendToAll(new CPacketSyncAutoAnim((EntityNPCInterface) event.npc.getMCEntity(), EnumSyncAutoAnim.RANGED_ATTACK)); + if(event != null && event.npc != null && event.npc.getMCEntity() != null) + NetworkHandler.sendToAll(new CPacketSyncAutoAnim((EntityNPCInterface) event.npc.getMCEntity(), EnumSyncAutoAnim.RANGED_ATTACK)); } @SubscribeEvent public void onNpcDamaged(NpcEvent.DamagedEvent event){ - NetworkHandler.sendToAll(new CPacketSyncAutoAnim((EntityNPCInterface) event.npc.getMCEntity(), EnumSyncAutoAnim.HURT)); + if(event != null && event.npc != null && event.npc.getMCEntity() != null) + NetworkHandler.sendToAll(new CPacketSyncAutoAnim((EntityNPCInterface) event.npc.getMCEntity(), EnumSyncAutoAnim.HURT)); } }