Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-06-30 00:14:48 +02:00
Code Issues Projects Releases Wiki Activity

Also cancel push event if not collidable

Browse Source
This commit is contained in:
fullwall 2020-07-06 21:48:57 +08:00
parent c68ba08f9d
commit 002b2b61ff
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/net/citizensnpcs/util/Util.java
View File

@ -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;
}