diff --git a/minecraft_server/src/net/minecraft/server/MinecraftServer.java b/minecraft_server/src/net/minecraft/server/MinecraftServer.java
index 2b48668..6bec6a4 100644
--- a/minecraft_server/src/net/minecraft/server/MinecraftServer.java
+++ b/minecraft_server/src/net/minecraft/server/MinecraftServer.java
@@ -114,7 +114,7 @@ public class MinecraftServer implements ICommandListener, Runnable {
 		this.worldMngr.func_4072_a(new WorldManager(this));
 		this.worldMngr.monstersEnabled = this.propertyManagerObj.getBooleanProperty("spawn-monsters", true) ? 1 : 0;
 		this.configManager.setPlayerManager(this.worldMngr);
-		byte var2 = 10;
+		byte var2 = 20;
 
 		for(int var3 = -var2; var3 <= var2; ++var3) {
 			this.func_6019_a("Preparing spawn area", (var3 + var2) * 100 / (var2 + var2 + 1));
diff --git a/minecraft_server/src/net/minecraft/src/NetServerHandler.java b/minecraft_server/src/net/minecraft/src/NetServerHandler.java
index 52283de..8bbf59c 100644
--- a/minecraft_server/src/net/minecraft/src/NetServerHandler.java
+++ b/minecraft_server/src/net/minecraft/src/NetServerHandler.java
@@ -231,6 +231,9 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
 			if(var16 < 256.0D) {
 				this.playerEntity.field_421_a.sendPacket(new Packet53BlockChange(var4, var5, var6, this.mcServer.worldMngr));
 			}
+			if(!(var19 > 16 || var2)) {
+				this.playerEntity.field_421_a.sendPacket(new Packet3Chat("You cannot place/break blocks in this area!"));
+			}
 		}
 
 		this.mcServer.worldMngr.field_819_z = false;
@@ -252,10 +255,8 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
 				var8 = var7;
 			}
 
-			if(var8 > 16 || var2) {
-				ItemStack var9 = var1.id >= 0 ? new ItemStack(var1.id) : null;
-				this.playerEntity.field_425_ad.func_327_a(this.playerEntity, this.mcServer.worldMngr, var9, var10, var4, var5, var6);
-			}
+			ItemStack var9 = var1.id >= 0 ? new ItemStack(var1.id) : null;
+			this.playerEntity.field_425_ad.func_327_a(this.playerEntity, this.mcServer.worldMngr, var9, var10, var4, var5, var6);
 
 			this.playerEntity.field_421_a.sendPacket(new Packet53BlockChange(var10, var4, var5, this.mcServer.worldMngr));
 			if(var6 == 0) {
@@ -283,6 +284,23 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
 			}
 
 			this.playerEntity.field_421_a.sendPacket(new Packet53BlockChange(var10, var4, var5, this.mcServer.worldMngr));
+			
+			if(!(var8 > 16 | var2)) {
+				if(field_10_k != null) {
+					this.playerEntity.field_421_a.sendPacket(new Packet3Chat("You cannot place/break blocks in this area!"));
+					this.playerEntity.field_425_ad.func_323_b(var10, var4, var5);
+					this.playerEntity.field_421_a.sendPacket(new Packet53BlockChange(var10, var4, var5, this.mcServer.worldMngr));
+					ItemStack[] stack = this.playerEntity.inventory.mainInventory.clone();
+					ItemStack stack1 = new ItemStack(var1.id);
+					if(stack[this.playerEntity.inventory.currentItem] != null) {
+						stack1.stackSize = stack[this.playerEntity.inventory.currentItem].stackSize + 1;	
+					} else {
+						stack1.stackSize = 1;
+					}
+					stack[this.playerEntity.inventory.currentItem] = stack1;
+					this.playerEntity.field_421_a.sendPacket(new Packet5PlayerInventory(-1, stack));
+				}
+			}
 		}
 
 		this.mcServer.worldMngr.field_819_z = false;