From c988e9a723881540bbcb376f4afee7aa596ca64a Mon Sep 17 00:00:00 2001
From: Gibstick <gibsticker@gmail.com>
Date: Thu, 18 Jul 2013 21:17:05 -0400
Subject: [PATCH] added new /ds stop to stop single parties, renamed old /ds
 stop to stopall

---
 dist/DiscoSheep.jar                           | Bin 29945 -> 30158 bytes
 .../discosheep/DiscoSheepCommandExecutor.java |  19 ++++++++++++------
 src/plugin.yml                                |   4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dist/DiscoSheep.jar b/dist/DiscoSheep.jar
index 21a6466f8448af12a0af1b2402fa5fae13b672fe..40c298e908a029864e4ae5efad6f52e9c8c6980f 100644
GIT binary patch
delta 3955
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
URJkHS`X>9ugL3Y#XLktoUmH*ar2qf`

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

diff --git a/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java b/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java
index 873e0b2..b1ffaa8 100644
--- a/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java
+++ b/src/gibstick/bukkit/discosheep/DiscoSheepCommandExecutor.java
@@ -18,7 +18,7 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
 	private static final String PERMISSION_PARTY = "discosheep.party";
 	private static final String PERMISSION_ALL = "discosheep.partyall";
 	private static final String PERMISSION_FIREWORKS = "discosheep.fireworks";
-	private static final String PERMISSION_STOP = "discosheep.stop";
+	private static final String PERMISSION_STOPALL = "discosheep.stopall";
 	private static final String PERMISSION_RELOAD = "discosheep.reload";
 	private static final String PERMISSION_OTHER = "discosheep.partyother";
 
@@ -110,15 +110,20 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
 		}
 	}
 
-	private boolean stopCommand(CommandSender sender) {
-		if (senderHasPerm(sender, PERMISSION_STOP)) {
+	private boolean stopAllCommand(CommandSender sender) {
+		if (senderHasPerm(sender, PERMISSION_STOPALL)) {
 			parent.stopAllParties();
 			return true;
 		} else {
-			return noPermsMessage(sender, PERMISSION_STOP);
+			return noPermsMessage(sender, PERMISSION_STOPALL);
 		}
 	}
 
+	private boolean stopMeCommand(CommandSender sender) {
+		parent.stopParty(sender.getName());
+		return true;
+	}
+
 	private boolean partySelectCommand(String[] players, CommandSender sender, int _duration, int _sheepNumber, int _radius, int _period, boolean _fireworks) {
 		if (senderHasPerm(sender, PERMISSION_OTHER)) {
 			Player p;
@@ -200,8 +205,10 @@ public class DiscoSheepCommandExecutor implements CommandExecutor {
 
 			if (args[0].equalsIgnoreCase("all")) {
 				return partyAllCommand(player, duration, sheepNumber, radius, period, fireworks);
-			} else if (args[0].equalsIgnoreCase("stop")) {
-				return stopCommand(sender);
+			} else if (args[0].equalsIgnoreCase("stopall")) {
+				return stopAllCommand(sender);
+			} else if (args[0].equalsIgnoreCase("stop") && isPlayer) {
+				return stopMeCommand(sender);
 			} else if (args[0].equalsIgnoreCase("me") && isPlayer) {
 				return partyCommand(player, duration, sheepNumber, radius, period, fireworks);
 			} else if (args[0].equalsIgnoreCase("other")) {
diff --git a/src/plugin.yml b/src/plugin.yml
index 81b1e23..5f152c5 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -16,7 +16,7 @@ permissions:
       discosheep.party: true
       discosheep.partyall: true
       discosheep.fireworks: true
-      discosheep.stop: true
+      discosheep.stopall: true
       discosheep.reload: true
   discosheep.party:
     description: Allows a player to have a party of one
@@ -24,7 +24,7 @@ permissions:
   discosheep.partyall:
     description: Allows a player to call a server-wide party
     default: op
-  discosheep.stop:
+  discosheep.stopall:
     description: Allows a player to stop all parties on the server
     default: op
   discosheep.fireworks: