Increased nuclear reactor size, fixed multiblock bug

core/src/io/anuke/mindustry/world/Tile.java

@@ -131,15 +131,15 @@ public class Tile{
 	}
 	
 	/**Returns the list of all tiles linked to this multiblock, or an empty array if it's not a multiblock.
-	 * This array contains only linked tiles, not this tile itself.*/
+	 * This array contains all linked tiles, including this tile itself.*/
 	public Array<Tile> getLinkedTiles(){
 		tmpArray.clear();
-		if(!(block.width == 1 && block.health == 1)){
+		if(!(block.width == 1 && block.height == 1)){
 			int offsetx = -(block.width-1)/2;
 			int offsety = -(block.height-1)/2;
 			for(int dx = 0; dx < block.width; dx ++){
 				for(int dy = 0; dy < block.height; dy ++){
-					Tile other = World.tile(x + dx - offsetx, y + dy - offsety);
+					Tile other = World.tile(x + dx + offsetx, y + dy + offsety);
 					tmpArray.add(other);
 				}
 			}

core/src/io/anuke/mindustry/world/World.java

@@ -281,7 +281,7 @@ public class World{
 			int offsety = -(type.height-1)/2;
 			for(int dx = 0; dx < type.width; dx ++){
 				for(int dy = 0; dy < type.height; dy ++){
-					Tile other = tile(x + dx - offsetx, y + dy - offsety);
+					Tile other = tile(x + dx + offsetx, y + dy + offsety);
 					if(other == null || other.block() != Blocks.air){
 						return false;
 					}
@@ -311,7 +311,6 @@ public class World{
 		}else{
 			Tile target = tile.isLinked() ? tile.getLinked() : tile;
 			Array<Tile> removals = target.getLinkedTiles();
-			removals.add(tile);
 			for(Tile toremove : removals){
 				//note that setting a new block automatically unlinks it
 				toremove.setBlock(Blocks.air);

core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java

@@ -220,14 +220,14 @@ public class ProductionBlocks{
 		{
 			//TODO
 			formalName = "nuclear reactor";
-			width = 2;
-			height = 2;
+			width = 3;
+			height = 3;
 			generateLiquid = Liquid.water;
 			generateItem = Item.uranium;
 			itemCapacity = 60;
 			itemInput = 6;
 			inputLiquid = 2f;
-			health = 340;
+			health = 500;
 			breaktime *= 2.2f;
 			powerCapacity = 100f;
 		}