From 4a40ef8778c76bc7cceeb8ec0526b2af32022fef Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Wed, 31 Oct 2012 10:10:48 +0800
Subject: [PATCH] Owner check in Controllable

---
 src/main/java/net/citizensnpcs/trait/Controllable.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/citizensnpcs/trait/Controllable.java b/src/main/java/net/citizensnpcs/trait/Controllable.java
index 8b7697199..854a6d515 100644
--- a/src/main/java/net/citizensnpcs/trait/Controllable.java
+++ b/src/main/java/net/citizensnpcs/trait/Controllable.java
@@ -7,6 +7,7 @@ import net.citizensnpcs.api.event.NPCRightClickEvent;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
+import net.citizensnpcs.api.trait.trait.Owner;
 import net.citizensnpcs.api.util.DataKey;
 import net.citizensnpcs.command.CommandConfigurable;
 import net.citizensnpcs.command.CommandContext;
@@ -58,7 +59,8 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
                 player.leaveVehicle();
             return;
         }
-        handle.setPassengerOf(getHandle());
+        if (npc.getTrait(Owner.class).isOwnedBy(handle.getBukkitEntity()))
+            handle.setPassengerOf(getHandle());
     }
 
     private EntityLiving getHandle() {