Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-28 15:17:43 +02:00
Code Issues Projects Releases Wiki Activity

Fix vehicle enter prevention not working properly

Browse Source
This commit is contained in:
fullwall 2018-03-09 19:29:59 +08:00
parent 1f540d2ad2
commit 30ef5de8e0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/java/net/citizensnpcs/EventListen.java
View File

@ -501,12 +501,13 @@ public class EventListen implements Listener {
} }
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onVehicleEnter(VehicleEnterEvent event) { public void onVehicleEnter(final VehicleEnterEvent event) {
if (!npcRegistry.isNPC(event.getEntered())) if (!npcRegistry.isNPC(event.getVehicle()))
return; return;
NPC npc = npcRegistry.getNPC(event.getEntered()); NPC npc = npcRegistry.getNPC(event.getVehicle());
if ((npc.getEntity() instanceof AbstractHorse || npc.getEntity().getType() == EntityType.BOAT 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); event.setCancelled(true);
} }
} }