TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-06 20:43:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1949 from Ichbinjoe/2.x_feature_jail_no_teleport

Browse source 
[Feature] Add config optn. to disable jail free tp
This commit is contained in:
Joseph Hirschfeld 2019-04-17 02:04:16 -04:00 • committed by GitHub
commit 8c0aa840ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Essentials/src/com/earth2me/essentials/User.java
View file

@ -522,12 +522,14 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
setJailed(false);
sendMessage(tl("haveBeenReleased"));
setJail(null);
try {
getTeleport().back();
} catch (Exception ex) {
if (ess.getSettings().isTeleportBackWhenFreedFromJail()) {
try {
getTeleport().respawn(null, TeleportCause.PLUGIN);
} catch (Exception ex1) {
getTeleport().back();
} catch (Exception ex) {
try {
getTeleport().respawn(null, TeleportCause.PLUGIN);
} catch (Exception ex1) {
}
}
}
return true;