1.4.2 rc1

5 files changed, 42 insertions, 5 deletions

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 5f3e2b8..c163c2d 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -44,6 +44,21 @@ autoJoin: false
 # default: false
 teleportToExit: false
 
+# What do you want to happen when a player leaves the lobby. If you are running a single server, maybe you want to send
+# them to the world hub. But if you are running a bungee-cord or velocity server, maybe you want to send them to the servers
+# hub.
+#
+#   EXIT  - Sends the player to the specified exit position set by /hs setexit
+#
+#   PROXY - Send the player to a specified server in a bungee-cord / velocity setup.
+#
+# default: EXIT
+leaveType: EXIT
+
+# Ignore this setting if you aren't using the PROXY leave type method above. If you are, set this to the server you want to send
+# players too.
+leaveServer: hub
+
 # The worldborder closes every interval, which is evey [delay] in minutes.
 # Thw worldborder starts at [size], and decreases 100 blocks every interval.
 # x & z are the center location. [enabled] is whenever the border is enabled.
@@ -53,6 +68,7 @@ worldBorder:
   z: 0
   delay: 10
   size: 500
+  moveAmount: 100
   warn: true
   enabled: false
 
@@ -99,6 +115,26 @@ lobby:
   max: 10
   enabled: true
 
+# Below are the two items given to you when you join a lobby. A item to click to leave the lobby, and another
+# to start the game. Each of these items can be toggled separately, but only these items are currently supported.
+# You can customize the material, name, lore, and position of the item. And finally, the start item is marked as
+# adminOnly be default since the /hs start command is also admin by default. If you set adminOnly to false, only
+# the item will become non admin only, not the command.
+lobbyItems:
+  leave:
+    material: BED
+    name: "&cLeave Lobby"
+    lore: ["Go back to server hub"]
+    position: 8
+    enabled: true
+  start:
+    material: CLOCK
+    name: "&bStart Game"
+    lore: []
+    position: 0
+    enabled: true
+    adminOnly: true
+
 # As a hider, the closer a seeker gets to you, the louder and faster a pining noise will play.
 # There are 3 separate distances (in blocks) you can set to the 3 different levels for the noise.
 # The higher the level, the closer the seeker.
@@ -128,7 +164,6 @@ blockedCommands: [msg, tp, gamemode, kill, give, effect]
 # the block ID you enter, as the plugin will automatically switch to the
 # block ID of your current Minecraft server version.
 blockedInteracts: [FURNACE, CRAFTING_TABLE, ANVIL, CHEST, BARREL]
-
 # ---------------------------------------------------------- #
 # ONLY EDIT BEYOND THIS POINT IF YOU KNOW WHAT YOU ARE DOING #
 # ---------------------------------------------------------- #
diff --git a/src/main/resources/items.yml b/src/main/resources/items.yml
index 4ef7953..682cfe4 100644
--- a/src/main/resources/items.yml
+++ b/src/main/resources/items.yml
@@ -40,6 +40,7 @@ items:
       material: POTION
       amount: 2
       type: INSTANT_HEAL
+
 effects:
   seeker:
     '1':
diff --git a/src/main/resources/lang/localization_en-US.yml b/src/main/resources/lang/localization_en-US.yml
index 16dacc8..33ae4ef 100644
--- a/src/main/resources/lang/localization_en-US.yml
+++ b/src/main/resources/lang/localization_en-US.yml
@@ -34,9 +34,10 @@ Localization:
   WORLDBORDER_INVALID_INPUT: "Invalid integer {AMOUNT}."
   WORLDBORDER_MIN_SIZE: "World border cannot be smaller than 100 blocks."
   WORLDBORDER_POSITION: "Spawn position must be 100 from world border center."
-  WORLDBORDER_ENABLE: "Set border center to current location, size to {AMOUNT}, and delay to {AMOUNT}."
-  WORLDBORDER_DECREASING: "World border decreasing by 100 blocks over the next 30s."
+  WORLDBORDER_ENABLE: "Set border center to current location, size to {AMOUNT}, delay to {AMOUNT}, and move to {AMOUNT}."
+  WORLDBORDER_DECREASING: "World border decreasing by {AMOUNT} blocks over the next 30s."
   WORLDBORDER_WARN: "World border will shrink in the next 30s!"
+  WORLDBORDER_CHANGE_SIZE: "World border change cannot be 0 or less."
   TAUNTED: "&c&oOh no! You have been chosen to be taunted."
   TAUNT: "A random hider will be taunted in the next 30s."
   TAUNT_ACTIVATE: "Taunt has been activated."
diff --git a/src/main/resources/leaderboard.yml b/src/main/resources/leaderboard.yml
index 376ae9f..9c7a777 100644
--- a/src/main/resources/leaderboard.yml
+++ b/src/main/resources/leaderboard.yml
@@ -71,7 +71,7 @@ game:
 countdown:
   waiting: "Waiting for players..."
   adminStart: "Waiting for gamemaster..."
-  counting: "Starting in: $a{AMOUNT}s"
+  counting: "Starting in: &a{AMOUNT}s"
 
 taunt:
   counting: "{AMOUNT}m{AMOUNT}s"
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 9fe2c54..7e1bca8 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: HideAndSeek
 main: net.tylermurphy.hideAndSeek.Main
-version: 1.4.1
+version: 1.4.2
 author: KenshinEto
 load: STARTUP
 api-version: 1.13