diff --git a/src/main/java/world/bentobox/bskyblock/Settings.java b/src/main/java/world/bentobox/bskyblock/Settings.java index 9bbad29..603519c 100644 --- a/src/main/java/world/bentobox/bskyblock/Settings.java +++ b/src/main/java/world/bentobox/bskyblock/Settings.java @@ -203,9 +203,6 @@ public class Settings implements DataObject, WorldSettings { @ConfigEntry(path = "island.reset.reset-limit") private int resetLimit = -1; - @ConfigEntry(path = "island.require-confirmation.reset") - private boolean resetConfirmation = true; - @ConfigComment("Kicked or leaving players lose resets") @ConfigComment("Players who leave a team will lose an island reset chance") @ConfigComment("If a player has zero resets left and leaves a team, they cannot make a new") @@ -254,10 +251,6 @@ public class Settings implements DataObject, WorldSettings { @ConfigEntry(path = "island.reset.on-leave.ender-chest") private boolean onLeaveResetEnderChest = false; - @ConfigComment("Have player's respawn on their island if they die") - @ConfigEntry(path = "island.respawn-on-island") - private boolean respawnOnIsland = true; - // Sethome @ConfigEntry(path = "island.sethome.nether.allow") private boolean allowSetHomeInNether = true; @@ -301,12 +294,6 @@ public class Settings implements DataObject, WorldSettings { @ConfigEntry(path = "protection.invincible-visitors") private List ivSettings = new ArrayList<>(); - //---------------------------------------------------------------------------------------/ - - @ConfigComment("Whether GUIs should be closed when the player clicks outside.") - @ConfigEntry(path = "panel.close-on-click-outside") - private boolean closePanelOnClickOutside = true; - //---------------------------------------------------------------------------------------/ @ConfigComment("These settings should not be edited") @ConfigEntry(path = "do-not-edit-these-settings.reset-epoch") @@ -561,13 +548,6 @@ public class Settings implements DataObject, WorldSettings { return resetLimit; } - /** - * @return the resetConfirmation - */ - public boolean isResetConfirmation() { - return resetConfirmation; - } - /** * @return the leaversLoseReset */ @@ -630,13 +610,6 @@ public class Settings implements DataObject, WorldSettings { return onLeaveResetEnderChest; } - /** - * @return the respawnOnIsland - */ - public boolean isRespawnOnIsland() { - return respawnOnIsland; - } - /** * @return the isDeathsCounted */ @@ -716,13 +689,6 @@ public class Settings implements DataObject, WorldSettings { return ivSettings; } - /** - * @return the closePanelOnClickOutside - */ - public boolean isClosePanelOnClickOutside() { - return closePanelOnClickOutside; - } - /** * @return the resetEpoch */ @@ -957,13 +923,6 @@ public class Settings implements DataObject, WorldSettings { this.resetLimit = resetLimit; } - /** - * @param resetConfirmation the resetConfirmation to set - */ - public void setResetConfirmation(boolean resetConfirmation) { - this.resetConfirmation = resetConfirmation; - } - /** * @param leaversLoseReset the leaversLoseReset to set */ @@ -1020,13 +979,6 @@ public class Settings implements DataObject, WorldSettings { this.onLeaveResetEnderChest = onLeaveResetEnderChest; } - /** - * @param respawnOnIsland the respawnOnIsland to set - */ - public void setRespawnOnIsland(boolean respawnOnIsland) { - this.respawnOnIsland = respawnOnIsland; - } - /** * @param deathsCounted the deathsCounted to set */ @@ -1069,13 +1021,6 @@ public class Settings implements DataObject, WorldSettings { this.ivSettings = ivSettings; } - /** - * @param closePanelOnClickOutside the closePanelOnClickOutside to set - */ - public void setClosePanelOnClickOutside(boolean closePanelOnClickOutside) { - this.closePanelOnClickOutside = closePanelOnClickOutside; - } - /** * @param allowSetHomeInNether the allowSetHomeInNether to set */ diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index a25a11b..92842d8 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -223,10 +223,6 @@ island: inventory: false # Reset Ender Chest - if true, the player's Ender Chest will be cleared. ender-chest: false - require-confirmation: - reset: true - # Have player's respawn on their island if they die - respawn-on-island: false sethome: nether: allow: true @@ -276,9 +272,6 @@ protection: - HOT_FLOOR - CRAMMING - VOID -panel: - # Whether GUIs should be closed when the player clicks outside. - close-on-click-outside: true do-not-edit-these-settings: # These settings should not be edited reset-epoch: 0