From 30ef5de8e03f2403712fe1dabd51069f71865de3 Mon Sep 17 00:00:00 2001 From: fullwall Date: Fri, 9 Mar 2018 19:29:59 +0800 Subject: [PATCH] Fix vehicle enter prevention not working properly --- main/src/main/java/net/citizensnpcs/EventListen.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java index a96564e44..f84a4d1bd 100644 --- a/main/src/main/java/net/citizensnpcs/EventListen.java +++ b/main/src/main/java/net/citizensnpcs/EventListen.java @@ -501,12 +501,13 @@ public class EventListen implements Listener { } @EventHandler(ignoreCancelled = true) - public void onVehicleEnter(VehicleEnterEvent event) { - if (!npcRegistry.isNPC(event.getEntered())) + public void onVehicleEnter(final VehicleEnterEvent event) { + if (!npcRegistry.isNPC(event.getVehicle())) return; - NPC npc = npcRegistry.getNPC(event.getEntered()); + NPC npc = npcRegistry.getNPC(event.getVehicle()); if ((npc.getEntity() instanceof AbstractHorse || npc.getEntity().getType() == EntityType.BOAT - || npc.getEntity() instanceof Minecart) && !npc.getTrait(Controllable.class).isEnabled()) { + || npc.getEntity().getType() == EntityType.PIG || npc.getEntity() instanceof Minecart) + && (!npc.hasTrait(Controllable.class) || !npc.getTrait(Controllable.class).isEnabled())) { event.setCancelled(true); } }