diff options
author | Chris Ward <chris@chrisgward.com> | 2013-01-09 20:25:54 +1100 |
---|---|---|
committer | Chris Ward <chris@chrisgward.com> | 2013-01-09 20:25:54 +1100 |
commit | dca47a117d75a6d1a668380c1fa72ab91fc9b724 (patch) | |
tree | 48eb56b3204c7a6e045bcb96a6c65f556fd2d03a | |
parent | 688cfca62595430ba28242394b9fa49e3f7360a0 (diff) | |
download | Essentials-dca47a117d75a6d1a668380c1fa72ab91fc9b724.tar Essentials-dca47a117d75a6d1a668380c1fa72ab91fc9b724.tar.gz Essentials-dca47a117d75a6d1a668380c1fa72ab91fc9b724.tar.lz Essentials-dca47a117d75a6d1a668380c1fa72ab91fc9b724.tar.xz Essentials-dca47a117d75a6d1a668380c1fa72ab91fc9b724.zip |
Set default tpa timeout to 2 minutes.
3725a5e6d4f08a8609fa98f72b0180dcdf4afc49
-rw-r--r-- | Essentials/src/config.yml | 2 | ||||
-rw-r--r-- | Essentials/src/net/ess3/settings/commands/Teleport.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 9bd8cedd6..94d83a444 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -345,7 +345,7 @@ sethome-multiple: # Set timeout in seconds for players to accept tpa before request is cancelled. # Set to 0 for no timeout -tpa-accept-cancellation: 0 +tpa-accept-cancellation: 120 ############################################################ # +------------------------------------------------------+ # diff --git a/Essentials/src/net/ess3/settings/commands/Teleport.java b/Essentials/src/net/ess3/settings/commands/Teleport.java index 6c6bdca06..ffa576410 100644 --- a/Essentials/src/net/ess3/settings/commands/Teleport.java +++ b/Essentials/src/net/ess3/settings/commands/Teleport.java @@ -14,7 +14,7 @@ public class Teleport implements StorageObject { "Set timeout in seconds for players to accept tpa before request is cancelled.", "Set to 0 for no timeout." }) - private int requestTimeout = 0; + private int requestTimeout = 120; @Comment({"Cancels a request made by tpa / tphere on world change to prevent cross world tp"}) private boolean cancelRequestsOnWorldChange = false; @Comment( |