From 7d10e25da5bf3e2eb437caa05c2429d03036c745 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sun, 30 Aug 2020 17:00:33 +0800
Subject: [PATCH] Fix condition in entityportalevent

---
 main/src/main/java/net/citizensnpcs/EventListen.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java
index 5d9452b8a..8b12b3420 100644
--- a/main/src/main/java/net/citizensnpcs/EventListen.java
+++ b/main/src/main/java/net/citizensnpcs/EventListen.java
@@ -311,7 +311,7 @@ public class EventListen implements Listener {
     @EventHandler
     public void onEntityPortal(EntityPortalEvent event) {
         NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getEntity());
-        if (npc == null && event.getEntityType() != EntityType.PLAYER)
+        if (npc == null || event.getEntityType() != EntityType.PLAYER)
             return;
         event.setCancelled(true);
         npc.despawn(DespawnReason.PENDING_RESPAWN);