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

Properly handle jail respawn in togglejail (#3522)

Browse source
This commit is contained in:
Josh Roy 2020-07-21 19:22:20 -04:00 • committed by GitHub
parent e34984513d
commit 9aec89f381
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/commands/Commandtogglejail.java
View file

@ -5,6 +5,7 @@ import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.DateUtil;
import net.ess3.api.events.JailStatusChangeEvent; import net.ess3.api.events.JailStatusChangeEvent;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.event.player.PlayerTeleportEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -101,7 +102,7 @@ public class Commandtogglejail extends EssentialsCommand {
player.setJailTimeout(0); player.setJailTimeout(0);
player.sendMessage(tl("jailReleasedPlayerNotify")); player.sendMessage(tl("jailReleasedPlayerNotify"));
player.setJail(null); player.setJail(null);
if (player.getBase().isOnline()) { if (player.getBase().isOnline() && ess.getSettings().isTeleportBackWhenFreedFromJail()) {
CompletableFuture<Boolean> future = getNewExceptionFuture(sender, commandLabel); CompletableFuture<Boolean> future = getNewExceptionFuture(sender, commandLabel);
player.getAsyncTeleport().back(future); player.getAsyncTeleport().back(future);
future.thenAccept(success -> { future.thenAccept(success -> {
@ -109,6 +110,11 @@ public class Commandtogglejail extends EssentialsCommand {
sender.sendMessage(tl("jailReleased", player.getName())); sender.sendMessage(tl("jailReleased", player.getName()));
} }
}); });
future.exceptionally(e -> {
player.getAsyncTeleport().respawn(null, PlayerTeleportEvent.TeleportCause.PLUGIN, new CompletableFuture<>());
sender.sendMessage(tl("jailReleased", player.getName()));
return false;
});
return; return;
} }
sender.sendMessage(tl("jailReleased", player.getName())); sender.sendMessage(tl("jailReleased", player.getName()));