- Remove /town unclaim outpost from /town unclaim ?

- Add /ta unclaim & /plot unclaim tab completes. - Closes #3883.
TownyAdvanced · Apr 9, 2020 · 7cccef6 · 7cccef6
1 parent 92b0c0d
commit 7cccef6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/resources/ChangeLog.txt b/resources/ChangeLog.txt
@@ -4431,4 +4431,7 @@ v0.92.0.11:
     - towny.command.plot.group.forsale: true
     - towny.command.plot.group.notforsale: true
   - Allow for other plugins to modify the TownPreClaim cancellation message.
-    - Closes #3814.
+    - Closes #3814.
+  - Remove /town unclaim outpost from /town unclaim ?
+  - Add /ta unclaim & /plot unclaim tab completes.
+    - Closes #3883.
diff --git a/src/com/palmergames/bukkit/towny/command/PlotCommand.java b/src/com/palmergames/bukkit/towny/command/PlotCommand.java
@@ -191,6 +191,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 						return NameUtil.filterByStart(plotToggleTabCompletes, args[1]);
 					break;
 				case "claim":
+				case "unclaim":
 				case "notforsale":
 				case "nfs":
 					if (args.length == 2)

diff --git a/src/com/palmergames/bukkit/towny/command/TownCommand.java b/src/com/palmergames/bukkit/towny/command/TownCommand.java
@@ -172,11 +172,10 @@ public class TownCommand extends BaseCommand implements CommandExecutor, TabComp
 		"rect"
 	);
 
-	private static final List<String> townUnclaimTabCompletes = Arrays.asList(
+	public static final List<String> townUnclaimTabCompletes = Arrays.asList(
 		"circle",
 		"rect",
-		"all",
-		"outpost"
+		"all"
 	);
 
 	private static List<String> townInviteTabCompletes = Arrays.asList(
@@ -3344,7 +3343,6 @@ public static void parseTownUnclaimCommand(Player player, String[] split) {
 			player.sendMessage(ChatTools.formatCommand(TownySettings.getLangString("mayor_sing"), "/town unclaim", "", TownySettings.getLangString("mayor_help_6")));
 			player.sendMessage(ChatTools.formatCommand(TownySettings.getLangString("mayor_sing"), "/town unclaim", "[circle/rect] [radius]", TownySettings.getLangString("mayor_help_7")));
 			player.sendMessage(ChatTools.formatCommand(TownySettings.getLangString("mayor_sing"), "/town unclaim", "all", TownySettings.getLangString("mayor_help_8")));
-			player.sendMessage(ChatTools.formatCommand(TownySettings.getLangString("mayor_sing"), "/town unclaim", "outpost", TownySettings.getLangString("mayor_help_9")));
 		} else {
 			Resident resident;
 			Town town;

diff --git a/src/com/palmergames/bukkit/towny/command/TownyAdminCommand.java b/src/com/palmergames/bukkit/towny/command/TownyAdminCommand.java
@@ -388,6 +388,9 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 					return getTownyStartingWith(args[3], "t");
 				}
 				break;
+			case "unclaim":
+				if (args.length == 2)
+					return NameUtil.filterByStart(TownCommand.townUnclaimTabCompletes, args[1]);
 			default:
 				if (args.length == 1)
 					return NameUtil.filterByStart(adminTabCompletes, args[0]);