1 files changed, 13 insertions, 1 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java
index 210f7fe..c94a0d1 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBounds.java
@@ -24,15 +24,25 @@ public class SetBounds implements ICommand {
 			sender.sendMessage(errorPrefix + message("BOUNDS_WRONG_WORLD"));
 			return;
 		}
+		if(player.getLocation().getBlockX() == 0 || player.getLocation().getBlockZ() == 0){
+			sender.sendMessage(errorPrefix + message("NOT_AT_ZERO"));
+			return;
+		}
+		boolean first = true;
+		if(saveMinX != 0 && saveMinZ != 0 && saveMaxX != 0 && saveMaxZ != 0) {
+			saveMinX = 0; saveMinZ= 0; saveMaxX = 0; saveMaxZ = 0;
+		}
 		if(saveMaxX == 0) {
 			addToConfig("bounds.max.x", player.getLocation().getBlockX());
 			saveMaxX = player.getLocation().getBlockX();
 		} else if(saveMaxX < player.getLocation().getBlockX()) {
+			first = false;
 			addToConfig("bounds.max.x", player.getLocation().getBlockX());
 			addToConfig("bounds.min.x", saveMaxX);
 			saveMinX = saveMaxX;
 			saveMaxX = player.getLocation().getBlockX();
 		} else {
+			first = false;
 			addToConfig("bounds.min.x", player.getLocation().getBlockX());
 			saveMinX = player.getLocation().getBlockX();
 		}
@@ -40,15 +50,17 @@ public class SetBounds implements ICommand {
 			addToConfig("bounds.max.z", player.getLocation().getBlockZ());
 			saveMaxZ = player.getLocation().getBlockZ();
 		} else if(saveMaxZ < player.getLocation().getBlockZ()) {
+			first = false;
 			addToConfig("bounds.max.z", player.getLocation().getBlockZ());
 			addToConfig("bounds.min.z", saveMaxZ);
 			saveMinZ = saveMaxZ;
 			saveMaxZ = player.getLocation().getBlockZ();
 		} else {
+			first = false;
 			addToConfig("bounds.min.z", player.getLocation().getBlockZ());
 			saveMinZ = player.getLocation().getBlockZ();
 		}
-		sender.sendMessage(messagePrefix + message("BOUNDS"));
+		sender.sendMessage(messagePrefix + message("BOUNDS").addAmount(first ? 1 : 2));
 		saveConfig();
 	}