Added perm to bypass cooldowns.

Removed old reference to invite wait in config.yml and settings.
This commit is contained in:
tastybento 2018-08-04 18:47:48 -07:00
parent 70d540d7bf
commit 0d564d94b2
3 changed files with 3 additions and 22 deletions

View File

@ -62,6 +62,9 @@ permissions:
acidisland.mod.tp: acidisland.mod.tp:
description: Allows teleport to an island description: Allows teleport to an island
default: op default: op
acidisland.mod.bypasscooldowns:
description: Allow moderator to bypass cooldowns
default: op
acidisland.mod.bypassprotect: acidisland.mod.bypassprotect:
description: Allow moderator to bypass island protection description: Allow moderator to bypass island protection
default: op default: op

View File

@ -201,10 +201,6 @@ island:
# These set the minimum and maximum size of a name. # These set the minimum and maximum size of a name.
min-length: 4 min-length: 4
max-length: 20 max-length: 20
# How long a player must wait until they can rejoin a team island after being
# kicked in minutes. This slows the effectiveness of players repeating challenges
# by repetitively being invited to a team island.
invite-wait: 60
reset: reset:
# How many resets a player is allowed (override with /asadmin clearreset <player>) # How many resets a player is allowed (override with /asadmin clearreset <player>)
# Value of -1 means unlimited, 0 means hardcore - no resets. # Value of -1 means unlimited, 0 means hardcore - no resets.

View File

@ -259,11 +259,6 @@ public class AISettings implements DataObject, WorldSettings {
private int nameMinLength = 4; private int nameMinLength = 4;
@ConfigEntry(path = "island.name.max-length") @ConfigEntry(path = "island.name.max-length")
private int nameMaxLength = 20; private int nameMaxLength = 20;
@ConfigComment("How long a player must wait until they can rejoin a team island after being")
@ConfigComment("kicked in minutes. This slows the effectiveness of players repeating challenges")
@ConfigComment("by repetitively being invited to a team island.")
@ConfigEntry(path = "island.invite-wait")
private int inviteWait = 60;
// Reset // Reset
@ConfigComment("How many resets a player is allowed (override with /asadmin clearreset <player>)") @ConfigComment("How many resets a player is allowed (override with /asadmin clearreset <player>)")
@ -542,13 +537,6 @@ public class AISettings implements DataObject, WorldSettings {
public Map<EntityType, Integer> getEntityLimits() { public Map<EntityType, Integer> getEntityLimits() {
return entityLimits; return entityLimits;
} }
/**
* Number of minutes to wait
* @return the inviteWait
*/
public int getInviteWait() {
return inviteWait;
}
/** /**
* @return the islandDistance * @return the islandDistance
*/ */
@ -841,12 +829,6 @@ public class AISettings implements DataObject, WorldSettings {
public void setImmediateTeleportOnIsland(boolean immediateTeleportOnIsland) { public void setImmediateTeleportOnIsland(boolean immediateTeleportOnIsland) {
this.immediateTeleportOnIsland = immediateTeleportOnIsland; this.immediateTeleportOnIsland = immediateTeleportOnIsland;
} }
/**
* @param inviteWait the inviteWait to set
*/
public void setInviteWait(int inviteWait) {
this.inviteWait = inviteWait;
}
/** /**
* @param islandDistance the islandDistance to set * @param islandDistance the islandDistance to set
*/ */