feat: make warmup cancellation conditions configurable, close #564

WiIIiam278 · Mar 31, 2024 · a95c3e0 · a95c3e0
1 parent f443780
commit a95c3e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/common/src/main/java/net/william278/huskhomes/config/Settings.java b/common/src/main/java/net/william278/huskhomes/config/Settings.java
@@ -137,6 +137,12 @@ public static class GeneralSettings {
         @Comment("How long a player has to stand still and not take damage for when teleporting (in seconds) ")
         private int teleportWarmupTime = 5;
 
+        @Comment("Whether the teleport warmup timer should be cancelled if the player takes damage")
+        private boolean teleportWarmupCancelOnDamage = true;
+
+        @Comment("Whether the teleport warmup timer should be cancelled if the player moves")
+        private boolean teleportWarmupCancelOnMove = true;
+
         @Comment("Where the teleport warmup timer should display (CHAT, ACTION_BAR, TITLE, SUBTITLE or NONE)")
         private Locales.DisplaySlot teleportWarmupDisplay = Locales.DisplaySlot.ACTION_BAR;
 

diff --git a/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java b/common/src/main/java/net/william278/huskhomes/teleport/TimedTeleport.java
@@ -141,7 +141,7 @@ private boolean tickAndGetIfDone() {
         }
 
         // Cancel the timed teleport if the player takes damage
-        if (hasTeleporterTakenDamage()) {
+        if (hasTeleporterTakenDamage() && plugin.getSettings().getGeneral().isTeleportWarmupCancelOnDamage()) {
             plugin.getLocales().getLocale("teleporting_cancelled_damage")
                     .ifPresent(teleporter::sendMessage);
             plugin.getLocales().getLocale("teleporting_action_bar_cancelled")
@@ -152,7 +152,7 @@ private boolean tickAndGetIfDone() {
         }
 
         // Cancel the timed teleport if the player moves
-        if (hasTeleporterMoved()) {
+        if (hasTeleporterMoved() && plugin.getSettings().getGeneral().isTeleportWarmupCancelOnMove()) {
             plugin.getLocales().getLocale("teleporting_cancelled_movement")
                     .ifPresent(teleporter::sendMessage);
             plugin.getLocales().getLocale("teleporting_action_bar_cancelled")