From 051449157a4462496a8681d582434573266240e9 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Sun, 9 Aug 2015 03:27:18 +1000
Subject: [PATCH] Fixes #522

---
 src/main/java/com/plotsquared/bukkit/BukkitMain.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/src/main/java/com/plotsquared/bukkit/BukkitMain.java
index 0f99cea9b..02293598c 100644
--- a/src/main/java/com/plotsquared/bukkit/BukkitMain.java
+++ b/src/main/java/com/plotsquared/bukkit/BukkitMain.java
@@ -293,7 +293,10 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                     }
                                     Location loc = entity.getLocation();
                                     if (MainUtil.isPlotRoad(BukkitUtil.getLocation(loc))) {
-                                        entity.remove();
+                                        Entity passenger = entity.getPassenger();
+                                        if (!(passenger instanceof Player)) {
+                                            entity.remove();
+                                        }
                                     }
                                     break;
                                 }