Skip to content

Commit

Permalink
Removes extraneous settings.
Browse files Browse the repository at this point in the history 
BentoBoxWorld/BentoBox#531
  • Loading branch information
@tastybento
tastybento committed Feb 9, 2019
1 parent 7a1a5b7 commit 2d31b96
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 185 deletions.
167 changes: 0 additions & 167 deletions src/main/java/world/bentobox/acidisland/AISettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,6 @@ public class AISettings implements DataObject, WorldSettings {
@ConfigEntry(path = "island.reset.reset-limit")
private int resetLimit = -1;

@ConfigEntry(path = "island.require-confirmation.reset")
private boolean resetConfirmation = true;

@ConfigComment("How long a player must wait before they can reset their island again in second")
@ConfigEntry(path = "island.reset-wait")
private long resetWait = 300;

@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")
Expand Down Expand Up @@ -343,15 +336,6 @@ public class AISettings implements DataObject, WorldSettings {
@ConfigEntry(path = "island.reset.on-leave.ender-chest")
private boolean onLeaveResetEnderChest = false;

@ConfigEntry(path = "island.make-island-if-none")
private boolean makeIslandIfNone = false;
@ConfigComment("Immediately teleport player to their island (home 1 if it exists) when entering the world")
@ConfigEntry(path = "island.immediate-teleport-on-island")
private boolean immediateTeleportOnIsland = 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;
Expand Down Expand Up @@ -399,27 +383,6 @@ public class AISettings implements DataObject, WorldSettings {
@ConfigEntry(path = "protection.invincible-visitors")
private List<String> ivSettings = new ArrayList<>();

// ---------------------------------------------

// Timeout for team kick and leave commands
@ConfigComment("Ask the player to confirm the command he is using by typing it again.")
@ConfigComment("The 'wait' value is the number of seconds to wait for confirmation.")
@ConfigEntry(path = "island.require-confirmation.kick")
private boolean kickConfirmation = true;

@ConfigEntry(path = "island.require-confirmation.kick-wait")
private long kickWait = 10L;

@ConfigEntry(path = "island.require-confirmation.leave")
private boolean leaveConfirmation = true;

@ConfigEntry(path = "island.require-confirmation.leave-wait")
private long leaveWait = 10L;

@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")
Expand Down Expand Up @@ -600,18 +563,6 @@ public int getIslandZOffset() {
public List<String> getIvSettings() {
return ivSettings;
}
/**
* @return the kickWait
*/
public long getKickWait() {
return kickWait;
}
/**
* @return the leaveWait
*/
public long getLeaveWait() {
return leaveWait;
}
/**
* @return the maxHomes
*/
Expand Down Expand Up @@ -680,12 +631,6 @@ public long getResetEpoch() {
public int getResetLimit() {
return resetLimit;
}
/**
* @return the resetWait
*/
public long getResetWait() {
return resetWait;
}
/**
* @return the seaHeight
*/
Expand Down Expand Up @@ -754,12 +699,6 @@ public boolean isAllowSetHomeInNether() {
public boolean isAllowSetHomeInTheEnd() {
return allowSetHomeInTheEnd;
}
/**
* @return whether panels should close when clicked outside or not
*/
public boolean isClosePanelOnClickOutside() {
return closePanelOnClickOutside;
}
/**
* @return the isDeathsCounted
*/
Expand Down Expand Up @@ -806,46 +745,18 @@ public boolean isFullArmorProtection() {
public boolean isHelmetProtection() {
return helmetProtection;
}
/**
* @return the immediateTeleportOnIsland
*/
public boolean isImmediateTeleportOnIsland() {
return immediateTeleportOnIsland;
}
/**
* @return the kickConfirmation
*/
public boolean isKickConfirmation() {
return kickConfirmation;
}
/**
* @return the kickedKeepInventory
*/
public boolean isKickedKeepInventory() {
return kickedKeepInventory;
}

/**
* @return the leaveConfirmation
*/
public boolean isLeaveConfirmation() {
return leaveConfirmation;
}

/**
* @return the leaversLoseReset
*/
public boolean isLeaversLoseReset() {
return leaversLoseReset;
}

/**
* @return the makeIslandIfNone
*/
public boolean isMakeIslandIfNone() {
return makeIslandIfNone;
}

/**
* @return the netherGenerate
*/
Expand Down Expand Up @@ -929,18 +840,6 @@ public boolean isRequireConfirmationToSetHomeInNether() {
public boolean isRequireConfirmationToSetHomeInTheEnd() {
return requireConfirmationToSetHomeInTheEnd;
}
/**
* @return the resetConfirmation
*/
public boolean isResetConfirmation() {
return resetConfirmation;
}
/**
* @return the respawnOnIsland
*/
public boolean isRespawnOnIsland() {
return respawnOnIsland;
}
@Override
public boolean isTeamJoinDeathReset() {
return teamJoinDeathReset;
Expand Down Expand Up @@ -1027,13 +926,6 @@ public void setAllowSetHomeInTheEnd(boolean allowSetHomeInTheEnd) {
public void setBanLimit(int banLimit) {
this.banLimit = banLimit;
}
/**
* Set panel close on click outside
* @param closePanelOnClickOutside - true means close panel when click is outside panel
*/
public void setClosePanelOnClickOutside(boolean closePanelOnClickOutside) {
this.closePanelOnClickOutside = closePanelOnClickOutside;
}
/**
* @param customRanks the customRanks to set
*/
Expand Down Expand Up @@ -1132,14 +1024,6 @@ public void setGeoLimitSettings(List<String> geoLimitSettings) {
public void setHelmetProtection(boolean helmetProtection) {
this.helmetProtection = helmetProtection;
}

/**
* @param immediateTeleportOnIsland the immediateTeleportOnIsland to set
*/
public void setImmediateTeleportOnIsland(boolean immediateTeleportOnIsland) {
this.immediateTeleportOnIsland = immediateTeleportOnIsland;
}

/**
* @param islandCommand what you want your island command to be
*/
Expand Down Expand Up @@ -1195,48 +1079,18 @@ public void setIslandZOffset(int islandZOffset) {
public void setIvSettings(List<String> ivSettings) {
this.ivSettings = ivSettings;
}
/**
* @param kickConfirmation the kickConfirmation to set
*/
public void setKickConfirmation(boolean kickConfirmation) {
this.kickConfirmation = kickConfirmation;
}
/**
* @param kickedKeepInventory the kickedKeepInventory to set
*/
public void setKickedKeepInventory(boolean kickedKeepInventory) {
this.kickedKeepInventory = kickedKeepInventory;
}
/**
* @param kickWait the kickWait to set
*/
public void setKickWait(long kickWait) {
this.kickWait = kickWait;
}
/**
* @param leaveConfirmation the leaveConfirmation to set
*/
public void setLeaveConfirmation(boolean leaveConfirmation) {
this.leaveConfirmation = leaveConfirmation;
}
/**
* @param leaversLoseReset the leaversLoseReset to set
*/
public void setLeaversLoseReset(boolean leaversLoseReset) {
this.leaversLoseReset = leaversLoseReset;
}
/**
* @param leaveWait the leaveWait to set
*/
public void setLeaveWait(long leaveWait) {
this.leaveWait = leaveWait;
}
/**
* @param makeIslandIfNone the makeIslandIfNone to set
*/
public void setMakeIslandIfNone(boolean makeIslandIfNone) {
this.makeIslandIfNone = makeIslandIfNone;
}
/**
* @param maxHomes the maxHomes to set
*/
Expand Down Expand Up @@ -1356,13 +1210,6 @@ public void setRequireConfirmationToSetHomeInNether(boolean requireConfirmationT
public void setRequireConfirmationToSetHomeInTheEnd(boolean requireConfirmationToSetHomeInTheEnd) {
this.requireConfirmationToSetHomeInTheEnd = requireConfirmationToSetHomeInTheEnd;
}

/**
* @param resetConfirmation the resetConfirmation to set
*/
public void setResetConfirmation(boolean resetConfirmation) {
this.resetConfirmation = resetConfirmation;
}
@Override
public void setResetEpoch(long timestamp) {
this.resetEpoch = timestamp;
Expand All @@ -1373,20 +1220,6 @@ public void setResetEpoch(long timestamp) {
public void setResetLimit(int resetLimit) {
this.resetLimit = resetLimit;
}
/**
* @param resetWait the resetWait to set
*/
public void setResetWait(long resetWait) {
this.resetWait = resetWait;
}

/**
* @param respawnOnIsland the respawnOnIsland to set
*/
public void setRespawnOnIsland(boolean respawnOnIsland) {
this.respawnOnIsland = respawnOnIsland;
}

/**
* @param seaHeight the seaHeight to set
*/
Expand Down
18 changes: 0 additions & 18 deletions src/main/resources/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,21 +273,6 @@ island:
inventory: false
# Reset Ender Chest - if true, the player's Ender Chest will be cleared.
ender-chest: false
require-confirmation:
reset: true
# Ask the player to confirm the command he is using by typing it again.
# The 'wait' value is the number of seconds to wait for confirmation.
kick: true
kick-wait: 10
leave: true
leave-wait: 10
# How long a player must wait before they can reset their island again in second
reset-wait: 300
make-island-if-none: false
# Immediately teleport player to their island (home 1 if it exists) when entering the world
immediate-teleport-on-island: false
# Have player's respawn on their island if they die
respawn-on-island: false
sethome:
nether:
allow: true
Expand Down Expand Up @@ -335,9 +320,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
Expand Down

0 comments on commit 2d31b96

Please sign in to comment.