summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-12-29 08:40:03 +0000
committerKHobbits <rob@khobbits.co.uk>2012-12-29 08:40:03 +0000
commit3725a5e6d4f08a8609fa98f72b0180dcdf4afc49 (patch)
treea27acbcdc297747cc22bdf41efe022f1dded2cae
parented88f8aa060eda90228b39bc075f1600c7a929d7 (diff)
downloadEssentials-3725a5e6d4f08a8609fa98f72b0180dcdf4afc49.tar
Essentials-3725a5e6d4f08a8609fa98f72b0180dcdf4afc49.tar.gz
Essentials-3725a5e6d4f08a8609fa98f72b0180dcdf4afc49.tar.lz
Essentials-3725a5e6d4f08a8609fa98f72b0180dcdf4afc49.tar.xz
Essentials-3725a5e6d4f08a8609fa98f72b0180dcdf4afc49.zip
Set default tpa timeout to 2 minutes.
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java2
-rw-r--r--Essentials/src/config.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 8eaa2a57c..95123d051 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -929,7 +929,7 @@ public class Settings implements ISettings
@Override
public long getTpaAcceptCancellation()
{
- return config.getLong("tpa-accept-cancellation", 0);
+ return config.getLong("tpa-accept-cancellation", 120);
}
@Override
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 0a532ab34..10247ab09 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -383,7 +383,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
############################################################
# +------------------------------------------------------+ #