Merge pull request #76 from tylermurphy534/1.6.1

1.6.1

4 files changed, 27 insertions, 1 deletions

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 9500859..1d61cdc 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -100,6 +100,14 @@ mapSaveEnabled: true
 # default: false
 saveInventory: false
 
+# By default, if you die in game, you will have to wait [delay] seconds until you respawn. This make is so that if you are killed as a seeker, you cannot
+# instally go to where the Hider that killed you was. Or if you were a Hider and died, you cant instally go to where you know other Hiders are. It gives some
+# breathing room. This can be disabled.
+# default: true
+delayedRespawn:
+  enabled: true
+  delay: 5
+
 # How you want to store game data. If you are running a single server, sqlite is fine, as no setup is necessary.
 # But if you want the data to go across multiple servers, you can switch it to mysql.
 # WARNING: Data is not saved across databases. You have to migrate the data yourself!
@@ -128,8 +136,11 @@ databaseName: hideandseek
 # You want block hunt? We have block hunt! Just enable it below, and set the
 # available blocks to pick from, and you're all set! It's that easy!
 # Items are displayed in the order that they are listed below.
+# The solidifyTime is the time in server ticks that it takes players to solidify.
+# Every 20 ticks is a second. Minimum solidifyTime is 20 ticks.
 blockhunt:
   enabled: false
+  solidifyTime: 60
   blocks: [CRAFTING_TABLE, GRASS_BLOCK, DIRT, BEACON, BOOKSHELF]
 
 worldBorder:
@@ -306,6 +317,13 @@ spawns:
     y: 0
     z: 0
     world: world
+  # Location where seekers wait during the hiding grace period
+  seeker:
+    x: 0
+    y: 0
+    z: 0
+    # Currently is not used, seekers are teleported to spawns.game.world
+    world: world
   # Location where players are teleported when they exit (/hs leave)
   exit:
     x: 0
diff --git a/src/main/resources/lang/localization_de-DE.yml b/src/main/resources/lang/localization_de-DE.yml
index a1a6eea..75523b2 100644
--- a/src/main/resources/lang/localization_de-DE.yml
+++ b/src/main/resources/lang/localization_de-DE.yml
@@ -46,6 +46,7 @@ Localization:
   SETUP: "&f&lFühre die folgenden Schritte zur Einrichtung aus:"
   SETUP_GAME: "&c&l- &fTeleport-Position für den Spielbeginn festlegen mit /hs setspawn"
   SETUP_LOBBY: "&c&l- &fTeleport-Position für die Lobby festlegen mit /hs setlobby"
+  SETUP_SEEKER_LOBBY: "&c&l- &fTeleport-Position für die Lobby Seekern festlegen mit /hs setseekerlobby"
   SETUP_EXIT: "&c&l- &fTeleport-Position für das Spielende festlegen mit /hs setexit"
   SETUP_SAVEMAP: "&c&l- &fHide and Seek Weltkarte speichern mit /hs savemap (nach /hs setspawn)"
   SETUP_COMPLETE: "Alles eingerichtet! Hide and Seek ist spielbereit."
@@ -73,6 +74,7 @@ Localization:
   BLOCKED_COMMAND: "Command blocked by Kenshin's Hide And Seek"
   FLYING_ENABLED: "Fliegen aktiviert"
   FLYING_DISABLED: "Fliegen deaktiviert"
+  RESPAWN_NOTICE: "Du wirst in {AMOUNT} Sekunden respawnen."
 
 # DO NOT EDIT IT OR IT MAY BREAK OR RESET FILE
 version: 3
diff --git a/src/main/resources/lang/localization_en-US.yml b/src/main/resources/lang/localization_en-US.yml
index 96ccf7a..02bc942 100644
--- a/src/main/resources/lang/localization_en-US.yml
+++ b/src/main/resources/lang/localization_en-US.yml
@@ -47,6 +47,7 @@ Localization:
   SETUP: "&f&lThe following is needed for setup..."
   SETUP_GAME: "&c&l- &fGame spawn isn't set, /hs setspawn"
   SETUP_LOBBY: "&c&l- &fLobby spawn isn't set, /hs setlobby"
+  SETUP_SEEKER_LOBBY: "&c&l- &fSeeker Lobby spawn isn't set, /hs setseekerlobby"
   SETUP_EXIT: "&c&l- &fQuit/exit teleport location isn't set, /hs setexit"
   SETUP_SAVEMAP: "&c&l- &fHide and seek map isn't saved, /hs savemap (after /hs setspawn)"
   SETUP_BOUNDS: "&c&l- &fPlease set game bounds in 2 opposite corners of the game map, /hs setbounds"
@@ -74,6 +75,7 @@ Localization:
   BLOCKED_COMMAND: "Command blocked by Hide And Seek plugin."
   FLYING_ENABLED: "&l&bFlying Enabled"
   FLYING_DISABLED: "&l&bFlying Disabled"
+  RESPAWN_NOTICE: "You will respawn in {AMOUNT} seconds."
 
 # DO NOT EDIT IT OR IT MAY BREAK OR RESET FILE
 version: 3
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index eab74ad..1f61282 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: KenshinsHideAndSeek
 main: net.tylermurphy.hideAndSeek.Main
-version: 1.6.0
+version: 1.6.1
 author: KenshinEto
 load: STARTUP
 api-version: 1.13
@@ -21,6 +21,7 @@ permissions:
       hideandseek.setborder: true
       hideandseek.setspawn: true
       hideandseek.setlobby: true
+      hideandseek.setseekerlobby: true
       hideandseek.setexit: true
       hideadnseek.setbounds: true
       hideandseek.setup: true
@@ -51,6 +52,9 @@ permissions:
   hideandseek.setlobby:
     description: Allows you to set the game lobby point
     default: op
+  hideandseek.setseekerlobby:
+    description: Allows you to set the game seeker lobby point
+    default: op
   hideandseek.setexit:
     description: Allows you to set the game exit point
     default: op