From 25c493c19b0ce9f2a657419bb2665740d3362125 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylermurphy534@gmail.com>
Date: Thu, 21 Apr 2022 20:12:09 -0400
Subject: 1.4.2 rc1

---
 .../java/net/tylermurphy/hideAndSeek/command/About.java  |  2 +-
 .../java/net/tylermurphy/hideAndSeek/command/Leave.java  | 12 +-----------
 .../net/tylermurphy/hideAndSeek/command/SetBorder.java   | 16 +++++++++++++---
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/main/java/net/tylermurphy/hideAndSeek/command')

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/About.java b/src/main/java/net/tylermurphy/hideAndSeek/command/About.java
index f19cb09..756a8e1 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/About.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/About.java
@@ -26,7 +26,7 @@ public class About implements ICommand {
 
 	public void execute(CommandSender sender, String[] args) {
 		sender.sendMessage(
-				String.format("%s%sHide and Seek %s(%s1.4.1%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY,ChatColor.WHITE,ChatColor.GRAY) +
+				String.format("%s%sHide and Seek %s(%s1.4.2%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY,ChatColor.WHITE,ChatColor.GRAY) +
 				String.format("%sAuthor: %s[KenshinEto]\n", ChatColor.GRAY, ChatColor.WHITE) + 
 				String.format("%sHelp Command: %s/hs %shelp", ChatColor.GRAY, ChatColor.AQUA, ChatColor.WHITE)
 			);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java
index cc4f0b4..8d8cf76 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java
@@ -47,17 +47,7 @@ public class Leave implements ICommand {
 			sender.sendMessage(errorPrefix + message("GAME_NOT_INGAME"));
 			return;
 		}
-		if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player));
-		else Game.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player));
-		Board.removeBoard(player);
-		Board.remove(player);
-		player.teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ()));
-		if(Game.status == Status.STANDBY) {
-			Board.reloadLobbyBoards();
-		} else {
-			Board.reloadGameBoards();
-			Board.reloadBoardTeams();
-		}
+		Game.leave(player);
 	}
 
 	public String getLabel() {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java
index 5f14b20..798b99f 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java
@@ -40,7 +40,7 @@ public class SetBorder implements ICommand {
 			sender.sendMessage(errorPrefix + message("ERROR_GAME_SPAWN"));
 			return;
 		}
-		if(args.length < 2) {
+		if(args.length < 3) {
 			worldborderEnabled = false;
 			addToConfig("worldBorder.enabled",false);
 			saveConfig();
@@ -48,7 +48,7 @@ public class SetBorder implements ICommand {
 			Game.resetWorldborder(spawnWorld);
 			return;
 		}
-		int num,delay;
+		int num,delay,change;
 		try { num = Integer.parseInt(args[0]); } catch (Exception e) {
 			sender.sendMessage(errorPrefix + message("WORLDBORDER_INVALID_INPUT").addAmount(args[0]));
 			return;
@@ -57,10 +57,18 @@ public class SetBorder implements ICommand {
 			sender.sendMessage(errorPrefix + message("WORLDBORDER_INVALID_INPUT").addAmount(args[1]));
 			return;
 		}
+		try { change = Integer.parseInt(args[2]); } catch (Exception e) {
+			sender.sendMessage(errorPrefix + message("WORLDBORDER_INVALID_INPUT").addAmount(args[2]));
+			return;
+		}
 		if(num < 100) {
 			sender.sendMessage(errorPrefix + message("WORLDBORDER_MIN_SIZE"));
 			return;
 		}
+		if(change < 1) {
+			sender.sendMessage(errorPrefix + message("WORLDBORDER_CHANGE_SIZE"));
+			return;
+		}
 		Vector newWorldborderPosition = new Vector();
 		Player player = (Player) sender;
 		newWorldborderPosition.setX(player.getLocation().getBlockX());
@@ -73,12 +81,14 @@ public class SetBorder implements ICommand {
 		worldborderPosition = newWorldborderPosition;
 		worldborderSize = num;
 		worldborderDelay = delay;
+		worldborderChange = change;
 		worldborderEnabled = true;
 		addToConfig("worldBorder.x", worldborderPosition.getBlockX());
 		addToConfig("worldBorder.z", worldborderPosition.getBlockZ());
 		addToConfig("worldBorder.delay", worldborderDelay);
 		addToConfig("worldBorder.size", worldborderSize);
 		addToConfig("worldBorder.enabled", true);
+		addToConfig("worldBorder.move", worldborderChange);
 		sender.sendMessage(messagePrefix + message("WORLDBORDER_ENABLE").addAmount(num).addAmount(delay));
 		saveConfig();
 		Game.resetWorldborder(spawnWorld);
@@ -89,7 +99,7 @@ public class SetBorder implements ICommand {
 	}
 	
 	public String getUsage() {
-		return "<size> <delay>";
+		return "<size> <delay> <move>";
 	}
 
 	public String getDescription() {
-- 
cgit v1.2.3-freya