From dbbe9d5dbaec848d1d282f2e6a44fca75852180f Mon Sep 17 00:00:00 2001
From: Gibstick <gibsticker@gmail.com>
Date: Fri, 19 Jul 2013 18:34:47 -0400
Subject: [PATCH] I cannot into boolean logic (fixed limit checking and
 exceptions)

---
 dist/DiscoSheep.jar                           | Bin 31665 -> 31770 bytes
 .../bukkit/discosheep/DiscoParty.java         |   8 ++++----
 .../discosheep/DiscoSheepCommandExecutor.java |   4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dist/DiscoSheep.jar b/dist/DiscoSheep.jar
index 5fb558801ac1d58811b824b1ffd8e1363e77de3e..5e1b1b7016ec45362182d39ff0aa1f2b8cdb739d 100644
GIT binary patch
delta 4035
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

delta 3922
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

diff --git a/src/gibstick/bukkit/discosheep/DiscoParty.java b/src/gibstick/bukkit/discosheep/DiscoParty.java
index 5ef8a82..345d4be 100644
--- a/src/gibstick/bukkit/discosheep/DiscoParty.java
+++ b/src/gibstick/bukkit/discosheep/DiscoParty.java
@@ -94,7 +94,7 @@ public class DiscoParty {
 	}
 
 	public DiscoParty setDuration(int duration) throws IllegalArgumentException {
-		if (duration <= DiscoParty.maxDuration || duration > 0) {
+		if (duration <= DiscoParty.maxDuration && duration > 0) {
 			this.duration = duration;
 			return this;
 		} else {
@@ -103,7 +103,7 @@ public class DiscoParty {
 	}
 
 	public DiscoParty setPeriod(int period) throws IllegalArgumentException {
-		if (period >= DiscoParty.minPeriod || period <= DiscoParty.maxPeriod) {
+		if (period >= DiscoParty.minPeriod && period <= DiscoParty.maxPeriod) {
 			this.period = period;
 			return this;
 		} else {
@@ -112,7 +112,7 @@ public class DiscoParty {
 	}
 
 	public DiscoParty setRadius(int radius) throws IllegalArgumentException {
-		if (radius <= DiscoParty.maxRadius || radius > 0) {
+		if (radius <= DiscoParty.maxRadius && radius > 0) {
 			this.radius = radius;
 			return this;
 		} else {
@@ -121,7 +121,7 @@ public class DiscoParty {
 	}
 
 	public DiscoParty setSheep(int sheep) throws IllegalArgumentException {
-		if (sheep <= DiscoParty.maxSheep || sheep > 0) {
+		if (sheep <= DiscoParty.maxSheep && sheep > 0) {
 			this.sheep = sheep;
 			return this;
 		} else {
diff --git a/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java b/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java
index 510bece..df3cc46 100644
--- a/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java
+++ b/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java
@@ -187,6 +187,7 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
 			} else if (args[i].equalsIgnoreCase("-r")) {
 				try {
 					mainParty.setRadius(parseNextIntArg(args, i));
+					sender.sendMessage("RADIUS OK");
 				} catch (IllegalArgumentException e) {
 					sender.sendMessage("Radius must be an integer within the range [1, "
 							+ DiscoParty.maxRadius + "]");
@@ -195,6 +196,7 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
 			} else if (args[i].equalsIgnoreCase("-n")) {
 				try {
 					mainParty.setSheep(parseNextIntArg(args, i));
+					sender.sendMessage("SHEEP OK");
 				} catch (IllegalArgumentException e) {
 					sender.sendMessage("The number of sheep must be an integer within the range [1, "
 							+ DiscoParty.maxSheep + "]");
@@ -203,6 +205,7 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
 			} else if (args[i].equalsIgnoreCase("-t")) {
 				try {
 					mainParty.setDuration(parent.toTicks(parseNextIntArg(args, i)));
+					sender.sendMessage("DURATION OK");
 				} catch (IllegalArgumentException e) {
 					sender.sendMessage("The duration in seconds must be an integer within the range [1, "
 							+ parent.toSeconds(DiscoParty.maxDuration) + "]");
@@ -211,6 +214,7 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
 			} else if (args[i].equalsIgnoreCase("-p")) {
 				try {
 					mainParty.setPeriod(parseNextIntArg(args, i));
+					sender.sendMessage("PERIOD OK");
 				} catch (IllegalArgumentException e) {
 					sender.sendMessage(
 							"The period in ticks must be within the range ["