--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2011/06/27 18:10:05	1532
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/secretdoor/Door.java	2011/06/29 14:57:08	1535
@@ -17,19 +17,23 @@
 	Location leftUpper;
 
 	
-	Location blocks[][] = new Location[2][2]; // [width][height] - [0][0] == leftUpper
+	Location blocks[][]; // [width][height] - [0][0] == leftUpper
 
 	int material;
 	
 	int direction;
 	
-	int width = 2;
-	int height = 2;
+	int width;
+	int height;
 	
 
-	public Door(Block sign) {
+	public Door(Block sign, int width, int height, DoorStorage store) throws ConflictingDoorException{
 		leftUpper = sign.getLocation().clone();
 		
+		this.width = width;
+		this.height = height;
+		
+		blocks = new Location[width][height];		
 
 		direction = sign.getData() - 2;
 		
@@ -53,6 +57,16 @@
 		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();
+				}
+			}
+		}
 
 	}
 
@@ -64,6 +78,13 @@
 		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] );
+		
+		width = Integer.parseInt( parts[6] );
+		height = Integer.parseInt( parts[7] );
+
+
+		blocks = new Location[width][height];		
+		
 		loadBlocks();
 	}
 	
@@ -111,8 +132,10 @@
 		
 		sb.append( ":" + direction );
 
-
 		sb.append( ":" + material );
+		
+		sb.append( ":" + width );
+		sb.append( ":" + height );
 
 		return sb.toString();
 	}
@@ -152,4 +175,4 @@
 		}
 	}
 
-}
\ No newline at end of file
+}