From 002b2b61ff67779a4e45dac681bdaa77a06bda3b Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Mon, 6 Jul 2020 21:48:57 +0800
Subject: [PATCH] Also cancel push event if not collidable

---
 main/src/main/java/net/citizensnpcs/util/Util.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/src/main/java/net/citizensnpcs/util/Util.java b/main/src/main/java/net/citizensnpcs/util/Util.java
index 9d30152a6..b574acada 100644
--- a/main/src/main/java/net/citizensnpcs/util/Util.java
+++ b/main/src/main/java/net/citizensnpcs/util/Util.java
@@ -46,7 +46,8 @@ public class Util {
 
     public static NPCPushEvent callPushEvent(NPC npc, Vector vector) {
         NPCPushEvent event = new NPCPushEvent(npc, vector);
-        event.setCancelled(npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true));
+        event.setCancelled(
+                npc.data().get(NPC.DEFAULT_PROTECTED_METADATA, true) || !npc.data().get(NPC.COLLIDABLE_METADATA, true));
         Bukkit.getPluginManager().callEvent(event);
         return event;
     }