--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/secretdoor/DoorOpenListener.java	2011/06/27 18:10:05	1532
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/secretdoor/DoorOpenListener.java	2012/01/27 12:21:27	1684
@@ -6,16 +6,17 @@
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerListener;
+import org.bukkit.event.Listener;
+import org.bukkit.event.EventHandler;
 import org.bukkit.plugin.Plugin;
 
 
 
-public class DoorOpenListener extends PlayerListener{
+public class DoorOpenListener implements Listener{
 	
-	DoorStorage store;
+	private DoorStorage store;
 	
-	Plugin plugin;
+	private Plugin plugin;
 	
 	public DoorOpenListener(DoorStorage store, Plugin plugin) {
 		super();
@@ -23,7 +24,7 @@
 		this.plugin = plugin;
 	}
 	
-	@Override
+	@EventHandler
 	public void onPlayerInteract(PlayerInteractEvent event) {
 
 		Player player = event.getPlayer();
@@ -42,16 +43,20 @@
 			return;
 		}
 
+		if (door.isPrivate() == true && !door.getOwner().equals(player.getName() ) ) {
+			return;
+		}
+
 		final World world = player.getWorld();
 		final Location loc = event.getClickedBlock().getLocation();
 
-		door.open( player.getWorld() );
+		door.open();
 
 		world.playEffect( loc, Effect.DOOR_TOGGLE, 0);
 
 		Runnable doorCloser = new Runnable() {
 			public void run() {
-				door.close( world );
+				door.close( );
 				world.playEffect( loc, Effect.DOOR_TOGGLE, 0);
 			}
 		};