--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2011/06/27 19:34:03	1533
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2011/07/24 17:23:48	1581
@@ -14,26 +14,29 @@
 	final static int NORTH = 2;
 	final static int SOUTH = 3;
 	
-	Location leftUpper;
+	private Location leftUpper;
 
 	
-	Location blocks[][]; // [width][height] - [0][0] == leftUpper
-
-	int material;
+	private Location blocks[][]; // [width][height] - [0][0] == leftUpper
+	private int material[][];
+	private byte data[][];
 	
-	int direction;
+	private int direction;
 	
-	int width;
-	int height;
+	private int width;
+	private int height;
+
+	private String owner;
 	
 
-	public Door(Block sign, int width, int height) {
+	public Door(Block sign, int width, int height, DoorStorage store, String owner) throws ConflictingDoorException{
 		leftUpper = sign.getLocation().clone();
 		
 		this.width = width;
 		this.height = height;
+
+		this.owner = owner;
 		
-		blocks = new Location[width][height];		
 
 		direction = sign.getData() - 2;
 		
@@ -54,9 +57,19 @@
 
 		
 		
-		material = leftUpper.getBlock().getTypeId();
+		//material = leftUpper.getBlock().getTypeId();
 		
 		loadBlocks();
+		
+	
+		for (int w=0; w<width; w++) {
+			for (int h=0; h<height; h++) {
+				Door d = store.findDoor( blocks[w][h] );
+				if (d != null) {
+					throw new ConflictingDoorException();
+				}
+			}
+		}
 
 	}
 
@@ -67,15 +80,41 @@
 
 		leftUpper  = new Location(w, Integer.parseInt(parts[1]),  Integer.parseInt(parts[2]),  Integer.parseInt(parts[3]) );
 		direction = Integer.parseInt( parts[4] );
-		material = Integer.parseInt( parts[5] );
+		//material = Integer.parseInt( parts[5] );
 		
 		width = Integer.parseInt( parts[6] );
 		height = Integer.parseInt( parts[7] );
+		owner = parts[8];
+
 		
 		loadBlocks();
 	}
+
+	public void powerChange(World world, int oldCurrent, int newCurrent ) {
+		if (isPowered() == true) {
+			open();
+		} else {
+			close();
+		}	
+	}
+
+	public boolean isPowered() {
+		for (int w=0; w<width; w++) {
+                        for (int h=0; h<height; h++) {
+				Block b = blocks[w][h].getBlock();
+
+				if ( b.isBlockPowered() ||  b.isBlockIndirectlyPowered() )
+					return true;
+                        }
+		}
+                	
+		return false;
+	}
 	
 	private void loadBlocks() {
+		blocks = new Location[width][height];		
+		material = new int[width][height];		
+		data = new byte[width][height];		
 		
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {
@@ -103,6 +142,9 @@
 				//System.out.println("Add block: " + x + ":" + y + ":" + z);
 				
 				blocks[w][h] = new Location( leftUpper.getWorld(), x, y, z);
+
+				material[w][h] = blocks[w][h].getBlock().getTypeId();
+				data[w][h] = blocks[w][h].getBlock().getData();
 				
 			}
 		}
@@ -119,10 +161,11 @@
 		
 		sb.append( ":" + direction );
 
-		sb.append( ":" + material );
+		sb.append( ":" + material[0][0] );
 		
 		sb.append( ":" + width );
 		sb.append( ":" + height );
+		sb.append( ":" + owner);
 
 		return sb.toString();
 	}
@@ -145,21 +188,27 @@
 
 	}
 
-	public void open(World world) {
+	public void open() {
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {				
-				blocks[w][h].getBlock().setTypeId(0);
+				blocks[w][h].getBlock().setTypeId(0, false);
 			}
 		}
 
 	}
 
-	public void close(World world) {
+	public void close() {
 		for (int w=0; w<width; w++) {
 			for (int h=0; h<height; h++) {				
-				blocks[w][h].getBlock().setTypeId( material );
+				blocks[w][h].getBlock().setTypeIdAndData( material[w][h], data[w][h], true );
 			}
 		}
 	}
 
-}
\ No newline at end of file
+
+	/////// setters and getters
+	public String getOwner() {
+		return owner;
+	}
+
+}