From a9b85961a9b0225d6aec804121a7ba07a7c60e69 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Tue, 12 Mar 2024 23:48:13 +0800
Subject: [PATCH] Null check entity in death event

---
 .../src/main/java/net/citizensnpcs/ProtocolLibListener.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java b/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java
index 1af7c1eee..c6e0c001c 100644
--- a/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java
+++ b/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java
@@ -250,9 +250,9 @@ public class ProtocolLibListener implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onNPCDespawn(NPCDespawnEvent event) {
-        if (event.getNPC().getEntity() != null) {
-            rotationTraits.remove(event.getNPC().getEntity().getEntityId());
-        }
+        if (event.getNPC().getEntity() == null)
+            return;
+        rotationTraits.remove(event.getNPC().getEntity().getEntityId());
         mirrorTraits.remove(event.getNPC().getEntity().getUniqueId());
     }