From 42121aa4bed7f59875df1c5e2e52c6b908a203be Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Sun, 2 Feb 2025 08:45:07 -0500
Subject: [PATCH] Remove deprecated teleport APIs (#6017)
They have been no-op deprecations for a while now
---
.../java/com/earth2me/essentials/IUser.java | 11 +-
.../java/com/earth2me/essentials/Jails.java | 24 +-
.../com/earth2me/essentials/Teleport.java | 402 ------------------
.../earth2me/essentials/TimedTeleport.java | 138 ------
.../java/com/earth2me/essentials/User.java | 21 -
.../com/earth2me/essentials/api/IJails.java | 11 -
6 files changed, 4 insertions(+), 603 deletions(-)
delete mode 100644 Essentials/src/main/java/com/earth2me/essentials/Teleport.java
delete mode 100644 Essentials/src/main/java/com/earth2me/essentials/TimedTeleport.java
diff --git a/Essentials/src/main/java/com/earth2me/essentials/IUser.java b/Essentials/src/main/java/com/earth2me/essentials/IUser.java
index 62456b81e68..bd3b3ec1957 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/IUser.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/IUser.java
@@ -3,7 +3,6 @@
import com.earth2me.essentials.api.IAsyncTeleport;
import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.config.entities.CommandCooldown;
-import net.ess3.api.ITeleport;
import net.ess3.api.MaxMoneyException;
import net.ess3.api.events.AfkStatusChangeEvent;
import net.essentialsx.api.v2.services.mail.MailMessage;
@@ -70,13 +69,9 @@ public interface IUser {
* @return whether there is a teleport request
*/
@Deprecated
- boolean hasOutstandingTeleportRequest();
-
- /**
- * @deprecated This API is not asynchronous. Use {@link com.earth2me.essentials.api.IAsyncTeleport IAsyncTeleport} with {@link IUser#getAsyncTeleport()}
- */
- @Deprecated
- ITeleport getTeleport();
+ default boolean hasOutstandingTeleportRequest() {
+ return getNextTpaRequest(false, false, false) != null;
+ }
IAsyncTeleport getAsyncTeleport();
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Jails.java b/Essentials/src/main/java/com/earth2me/essentials/Jails.java
index c29521923f5..f4e31f09692 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Jails.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Jails.java
@@ -40,7 +40,7 @@
import static com.earth2me.essentials.I18n.tlLiteral;
public class Jails implements net.ess3.api.IJails {
- private static transient boolean enabled = false;
+ private static boolean enabled = false;
private final IEssentials ess;
private final EssentialsConfiguration config;
private final Map<String, LazyLocation> jails = new HashMap<>();
@@ -142,28 +142,6 @@ public void removeJail(String jail) throws Exception {
}
}
- /**
- * @deprecated This method does not use asynchronous teleportation. Use {@link Jails#sendToJail(IUser, String, CompletableFuture)}
- */
- @SuppressWarnings("deprecation")
- @Override
- @Deprecated
- public void sendToJail(final IUser user, String jail) throws Exception {
- if (jail == null || jail.isEmpty()) {
- return;
- }
-
- jail = jail.toLowerCase(Locale.ENGLISH);
- synchronized (jails) {
- if (jails.containsKey(jail)) {
- if (user.getBase().isOnline()) {
- user.getTeleport().now(getJail(jail), false, TeleportCause.COMMAND);
- }
- user.setJail(jail);
- }
- }
- }
-
@Override
public void sendToJail(final IUser user, final String jailName, final CompletableFuture<Boolean> future) throws Exception {
if (jailName == null || jailName.isEmpty()) {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Teleport.java b/Essentials/src/main/java/com/earth2me/essentials/Teleport.java
deleted file mode 100644
index 7f9f66190e6..00000000000
--- a/Essentials/src/main/java/com/earth2me/essentials/Teleport.java
+++ /dev/null
@@ -1,402 +0,0 @@
-package com.earth2me.essentials;
-
-import com.earth2me.essentials.utils.DateUtil;
-import com.earth2me.essentials.utils.LocationUtil;
-import io.papermc.lib.PaperLib;
-import net.ess3.api.IEssentials;
-import net.ess3.api.ITeleport;
-import net.ess3.api.IUser;
-import net.ess3.api.TranslatableException;
-import net.ess3.api.events.UserWarpEvent;
-import net.ess3.api.events.teleport.PreTeleportEvent;
-import net.ess3.api.events.teleport.TeleportWarmupEvent;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-/**
- * @deprecated This API is not asynchronous. Use {@link com.earth2me.essentials.AsyncTeleport AsyncTeleport}
- */
-@Deprecated
-public class Teleport implements ITeleport {
- private final IUser teleportOwner;
- private final IEssentials ess;
- private TimedTeleport timedTeleport;
-
- private TeleportType tpType;
-
- @Deprecated
- public Teleport(final IUser user, final IEssentials ess) {
- this.teleportOwner = user;
- this.ess = ess;
- tpType = TeleportType.NORMAL;
- }
-
- @Deprecated
- public void cooldown(final boolean check) throws Exception {
- final Calendar time = new GregorianCalendar();
- if (teleportOwner.getLastTeleportTimestamp() > 0) {
- // Take the current time, and remove the delay from it.
- final double cooldown = ess.getSettings().getTeleportCooldown();
- final Calendar earliestTime = new GregorianCalendar();
- earliestTime.add(Calendar.SECOND, -(int) cooldown);
- earliestTime.add(Calendar.MILLISECOND, -(int) ((cooldown * 1000.0) % 1000.0));
- // This value contains the most recent time a teleportPlayer could have been used that would allow another use.
- final long earliestLong = earliestTime.getTimeInMillis();
-
- // When was the last teleportPlayer used?
- final long lastTime = teleportOwner.getLastTeleportTimestamp();
-
- if (lastTime > time.getTimeInMillis()) {
- // This is to make sure time didn't get messed up on last teleportPlayer use.
- // If this happens, let's give the user the benifit of the doubt.
- teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
- return;
- } else if (lastTime > earliestLong
- && cooldownApplies()) {
- time.setTimeInMillis(lastTime);
- time.add(Calendar.SECOND, (int) cooldown);
- time.add(Calendar.MILLISECOND, (int) ((cooldown * 1000.0) % 1000.0));
- throw new TranslatableException("timeBeforeTeleport", DateUtil.formatDateDiff(time.getTimeInMillis()));
- }
- }
- // if justCheck is set, don't update lastTeleport; we're just checking
- if (!check) {
- teleportOwner.setLastTeleportTimestamp(time.getTimeInMillis());
- }
- }
-
- @Deprecated
- private boolean cooldownApplies() {
- boolean applies = true;
- final String globalBypassPerm = "essentials.teleport.cooldown.bypass";
- switch (tpType) {
- case NORMAL:
- applies = !teleportOwner.isAuthorized(globalBypassPerm);
- break;
- case BACK:
- applies = !(teleportOwner.isAuthorized(globalBypassPerm) &&
- teleportOwner.isAuthorized("essentials.teleport.cooldown.bypass.back"));
- break;
- case TPA:
- applies = !(teleportOwner.isAuthorized(globalBypassPerm) &&
- teleportOwner.isAuthorized("essentials.teleport.cooldown.bypass.tpa"));
- break;
- }
- return applies;
- }
-
- @Deprecated
- private void warnUser(final IUser user, final double delay) {
- final Calendar c = new GregorianCalendar();
- c.add(Calendar.SECOND, (int) delay);
- c.add(Calendar.MILLISECOND, (int) ((delay * 1000.0) % 1000.0));
- user.sendTl("dontMoveMessage", DateUtil.formatDateDiff(c.getTimeInMillis()));
- }
-
- //The now function is used when you want to skip tp delay when teleporting someone to a location or player.
- @Override
- @Deprecated
- public void now(final Location loc, final boolean cooldown, final TeleportCause cause) throws Exception {
- if (cooldown) {
- cooldown(false);
- }
- final ITarget target = new LocationTarget(loc);
- now(teleportOwner, target, cause);
- }
-
- @Override
- @Deprecated
- public void now(final Player entity, final boolean cooldown, final TeleportCause cause) throws Exception {
- if (cooldown) {
- cooldown(false);
- }
- final ITarget target = new PlayerTarget(entity);
- now(teleportOwner, target, cause);
- teleportOwner.sendTl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ());
- }
-
- @Deprecated
- protected void now(final IUser teleportee, final ITarget target, final TeleportCause cause) throws Exception {
- cancel(false);
- Location loc = target.getLocation();
-
- final PreTeleportEvent event = new PreTeleportEvent(teleportee, cause, target);
- Bukkit.getServer().getPluginManager().callEvent(event);
- if (event.isCancelled()) {
- return;
- }
-
- if (teleportee.isAuthorized("essentials.back.onteleport")) {
- teleportee.setLastLocation();
- }
-
- if (!teleportee.getBase().isEmpty()) {
- if (!ess.getSettings().isTeleportPassengerDismount()) {
- throw new TranslatableException("passengerTeleportFail");
- }
- teleportee.getBase().eject();
- }
-
- if (LocationUtil.isBlockUnsafeForUser(ess, teleportee, loc.getWorld(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())) {
- if (ess.getSettings().isTeleportSafetyEnabled()) {
- if (ess.getSettings().isForceDisableTeleportSafety()) {
- PaperLib.teleportAsync(teleportee.getBase(), loc, cause);
- } else {
- PaperLib.teleportAsync(teleportee.getBase(), LocationUtil.getSafeDestination(ess, teleportee, loc), cause);
- }
- } else {
- throw new TranslatableException("unsafeTeleportDestination", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
- }
- } else {
- if (ess.getSettings().isForceDisableTeleportSafety()) {
- PaperLib.teleportAsync(teleportee.getBase(), loc, cause);
- } else {
- if (ess.getSettings().isTeleportToCenterLocation()) {
- loc = LocationUtil.getRoundedDestination(loc);
- }
- PaperLib.teleportAsync(teleportee.getBase(), loc, cause);
- }
- }
- }
-
- //The teleportPlayer function is used when you want to normally teleportPlayer someone to a location or player.
- //This method is nolonger used internally and will be removed.
- @Deprecated
- @Override
- public void teleport(final Location loc, final Trade chargeFor) throws Exception {
- teleport(loc, chargeFor, TeleportCause.PLUGIN);
- }
-
- @Override
- @Deprecated
- public void teleport(final Location loc, final Trade chargeFor, final TeleportCause cause) throws Exception {
- teleport(teleportOwner, new LocationTarget(loc), chargeFor, cause);
- }
-
- //This is used when teleporting to a player
- @Override
- @Deprecated
- public void teleport(final Player entity, final Trade chargeFor, final TeleportCause cause) throws Exception {
- final ITarget target = new PlayerTarget(entity);
- teleportOwner.sendTl("teleportToPlayer", entity.getDisplayName());
- teleport(teleportOwner, target, chargeFor, cause);
- }
-
- //This is used when teleporting to stored location
- @Override
- @Deprecated
- public void teleportPlayer(final IUser teleportee, final Location loc, final Trade chargeFor, final TeleportCause cause) throws Exception {
- teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
- }
-
- //This is used on /tphere
- @Override
- @Deprecated
- public void teleportPlayer(final IUser teleportee, final Player entity, final Trade chargeFor, final TeleportCause cause) throws Exception {
- final ITarget target = new PlayerTarget(entity);
- teleport(teleportee, target, chargeFor, cause);
- teleportee.sendTl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ());
- teleportOwner.sendTl("teleporting", target.getLocation().getWorld().getName(), target.getLocation().getBlockX(), target.getLocation().getBlockY(), target.getLocation().getBlockZ());
- }
-
- @Deprecated
- private void teleport(final IUser teleportee, final ITarget target, final Trade chargeFor, final TeleportCause cause) throws Exception {
- double delay = ess.getSettings().getTeleportDelay();
-
- final TeleportWarmupEvent event = new TeleportWarmupEvent(teleportee, cause, target, delay);
- Bukkit.getServer().getPluginManager().callEvent(event);
- if (event.isCancelled()) {
- return;
- }
- delay = event.getDelay();
-
- Trade cashCharge = chargeFor;
-
- if (chargeFor != null) {
- chargeFor.isAffordableFor(teleportOwner);
-
- //This code is to make sure that commandcosts are checked in the initial world, and not in the resulting world.
- if (!chargeFor.getCommandCost(teleportOwner).equals(BigDecimal.ZERO)) {
- //By converting a command cost to a regular cost, the command cost permission isn't checked when executing the charge after teleport.
- cashCharge = new Trade(chargeFor.getCommandCost(teleportOwner), ess);
- }
- }
-
- cooldown(true);
- if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass") || teleportee.isAuthorized("essentials.teleport.timer.bypass")) {
- cooldown(false);
- now(teleportee, target, cause);
- if (cashCharge != null) {
- cashCharge.charge(teleportOwner);
- }
- return;
- }
-
- cancel(false);
- warnUser(teleportee, delay);
- initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false);
- }
-
- @Deprecated
- private void teleportOther(final IUser teleporter, final IUser teleportee, final ITarget target, final Trade chargeFor, final TeleportCause cause) throws Exception {
- double delay = ess.getSettings().getTeleportDelay();
-
- final TeleportWarmupEvent event = new TeleportWarmupEvent(teleporter, teleportee, cause, target, delay);
- Bukkit.getServer().getPluginManager().callEvent(event);
- if (event.isCancelled()) {
- return;
- }
- delay = event.getDelay();
-
- Trade cashCharge = chargeFor;
-
- if (teleporter != null && chargeFor != null) {
- chargeFor.isAffordableFor(teleporter);
-
- //This code is to make sure that commandcosts are checked in the initial world, and not in the resulting world.
- if (!chargeFor.getCommandCost(teleporter).equals(BigDecimal.ZERO)) {
- //By converting a command cost to a regular cost, the command cost permission isn't checked when executing the charge after teleport.
- cashCharge = new Trade(chargeFor.getCommandCost(teleporter), ess);
- }
- }
-
- cooldown(true);
- if (delay <= 0 || teleporter == null
- || teleporter.isAuthorized("essentials.teleport.timer.bypass")
- || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")
- || teleportee.isAuthorized("essentials.teleport.timer.bypass")) {
- cooldown(false);
- now(teleportee, target, cause);
- if (teleporter != null && cashCharge != null) {
- cashCharge.charge(teleporter);
- }
- return;
- }
-
- cancel(false);
- warnUser(teleportee, delay);
- initTimer((long) (delay * 1000.0), teleportee, target, cashCharge, cause, false);
- }
-
- //The respawn function is a wrapper used to handle tp fallback, on /jail and /home
- @Override
- @Deprecated
- public void respawn(final Trade chargeFor, final TeleportCause cause) throws Exception {
- double delay = ess.getSettings().getTeleportDelay();
-
- final TeleportWarmupEvent event = new TeleportWarmupEvent(teleportOwner, cause, null, delay);
- Bukkit.getServer().getPluginManager().callEvent(event);
- if (event.isCancelled()) {
- return;
- }
- delay = event.getDelay();
-
- if (chargeFor != null) {
- chargeFor.isAffordableFor(teleportOwner);
- }
- cooldown(true);
- if (delay <= 0 || teleportOwner.isAuthorized("essentials.teleport.timer.bypass")) {
- cooldown(false);
- respawnNow(teleportOwner, cause);
- if (chargeFor != null) {
- chargeFor.charge(teleportOwner);
- }
- return;
- }
-
- cancel(false);
- warnUser(teleportOwner, delay);
- initTimer((long) (delay * 1000.0), teleportOwner, null, chargeFor, cause, true);
- }
-
- @Deprecated
- void respawnNow(final IUser teleportee, final TeleportCause cause) throws Exception {
- final Player player = teleportee.getBase();
- final Location bed = player.getBedSpawnLocation();
- if (bed != null) {
- now(teleportee, new LocationTarget(bed), cause);
- } else {
- if (ess.getSettings().isDebug()) {
- ess.getLogger().info("Could not find bed spawn, forcing respawn event.");
- }
- final PlayerRespawnEvent pre = new PlayerRespawnEvent(player, player.getWorld().getSpawnLocation(), false);
- ess.getServer().getPluginManager().callEvent(pre);
- now(teleportee, new LocationTarget(pre.getRespawnLocation()), cause);
- }
- }
-
- //The warp function is a wrapper used to teleportPlayer a player to a /warp
- @Override
- @Deprecated
- public void warp(final IUser teleportee, String warp, final Trade chargeFor, final TeleportCause cause) throws Exception {
- final UserWarpEvent event = new UserWarpEvent(teleportee, warp, chargeFor);
- Bukkit.getServer().getPluginManager().callEvent(event);
- if (event.isCancelled()) {
- return;
- }
-
- warp = event.getWarp();
- final Location loc = ess.getWarps().getWarp(warp);
- teleportee.sendTl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
- if (!teleportee.equals(teleportOwner)) {
- teleportOwner.sendTl("warpingTo", warp, loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
- }
- teleport(teleportee, new LocationTarget(loc), chargeFor, cause);
- }
-
- //The back function is a wrapper used to teleportPlayer a player /back to their previous location.
- @Override
- @Deprecated
- public void back(final Trade chargeFor) throws Exception {
- back(teleportOwner, chargeFor);
- }
-
- //This function is a wrapper over the other back function for cases where another player performs back for them
- @Override
- @Deprecated
- public void back(final IUser teleporter, final Trade chargeFor) throws Exception {
- tpType = TeleportType.BACK;
- final Location loc = teleportOwner.getLastLocation();
- teleportOwner.sendTl("backUsageMsg", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
- teleportOther(teleporter, teleportOwner, new LocationTarget(loc), chargeFor, TeleportCause.COMMAND);
- }
-
- //This function is used to throw a user back after a jail sentence
- @Override
- @Deprecated
- public void back() throws Exception {
- now(teleportOwner, new LocationTarget(teleportOwner.getLastLocation()), TeleportCause.COMMAND);
- }
-
- @Deprecated
- public void setTpType(final TeleportType tpType) {
- this.tpType = tpType;
- }
-
- //If we need to cancelTimer a pending teleportPlayer call this method
- @Deprecated
- private void cancel(final boolean notifyUser) {
- if (timedTeleport != null) {
- timedTeleport.cancelTimer(notifyUser);
- timedTeleport = null;
- }
- }
-
- @Deprecated
- private void initTimer(final long delay, final IUser teleportUser, final ITarget target, final Trade chargeFor, final TeleportCause cause, final boolean respawn) {
- timedTeleport = new TimedTeleport(teleportOwner, ess, this, delay, teleportUser, target, chargeFor, cause, respawn);
- }
-
- public enum TeleportType {
- TPA,
- BACK,
- NORMAL
- }
-}
diff --git a/Essentials/src/main/java/com/earth2me/essentials/TimedTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/TimedTeleport.java
deleted file mode 100644
index cfca5f607de..00000000000
--- a/Essentials/src/main/java/com/earth2me/essentials/TimedTeleport.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.earth2me.essentials;
-
-import net.ess3.api.IEssentials;
-import net.ess3.api.IUser;
-import org.bukkit.Location;
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-
-import java.util.UUID;
-
-@Deprecated
-public class TimedTeleport implements Runnable {
- private static final double MOVE_CONSTANT = 0.3;
- private final IUser teleportOwner;
- private final IEssentials ess;
- private final Teleport teleport;
- private final UUID timer_teleportee;
- private final long timer_started; // time this task was initiated
- private final long timer_delay; // how long to delay the teleportPlayer
- // note that I initially stored a clone of the location for reference, but...
- // when comparing locations, I got incorrect mismatches (rounding errors, looked like)
- // so, the X/Y/Z values are stored instead and rounded off
- private final long timer_initX;
- private final long timer_initY;
- private final long timer_initZ;
- private final ITarget timer_teleportTarget;
- private final boolean timer_respawn;
- private final boolean timer_canMove;
- private final Trade timer_chargeFor;
- private final TeleportCause timer_cause;
- private int timer_task;
- private double timer_health;
-
- TimedTeleport(final IUser user, final IEssentials ess, final Teleport teleport, final long delay, final IUser teleportUser, final ITarget target, final Trade chargeFor, final TeleportCause cause, final boolean respawn) {
- this.teleportOwner = user;
- this.ess = ess;
- this.teleport = teleport;
- this.timer_started = System.currentTimeMillis();
- this.timer_delay = delay;
- this.timer_health = teleportUser.getBase().getHealth();
- this.timer_initX = Math.round(teleportUser.getBase().getLocation().getX() * MOVE_CONSTANT);
- this.timer_initY = Math.round(teleportUser.getBase().getLocation().getY() * MOVE_CONSTANT);
- this.timer_initZ = Math.round(teleportUser.getBase().getLocation().getZ() * MOVE_CONSTANT);
- this.timer_teleportee = teleportUser.getBase().getUniqueId();
- this.timer_teleportTarget = target;
- this.timer_chargeFor = chargeFor;
- this.timer_cause = cause;
- this.timer_respawn = respawn;
- this.timer_canMove = user.isAuthorized("essentials.teleport.timer.move");
-
- timer_task = ess.runTaskTimerAsynchronously(this, 20, 20).getTaskId();
- }
-
- @Override
- public void run() {
-
- if (teleportOwner == null || !teleportOwner.getBase().isOnline() || teleportOwner.getBase().getLocation() == null) {
- cancelTimer(false);
- return;
- }
-
- final IUser teleportUser = ess.getUser(this.timer_teleportee);
-
- if (teleportUser == null || !teleportUser.getBase().isOnline()) {
- cancelTimer(false);
- return;
- }
-
- final Location currLocation = teleportUser.getBase().getLocation();
- if (currLocation == null) {
- cancelTimer(false);
- return;
- }
-
- if (!timer_canMove && (Math.round(currLocation.getX() * MOVE_CONSTANT) != timer_initX || Math.round(currLocation.getY() * MOVE_CONSTANT) != timer_initY || Math.round(currLocation.getZ() * MOVE_CONSTANT) != timer_initZ || teleportUser.getBase().getHealth() < timer_health)) {
- // user moved, cancelTimer teleportPlayer
- cancelTimer(true);
- return;
- }
-
- class DelayedTeleportTask implements Runnable {
- @Override
- public void run() {
-
- timer_health = teleportUser.getBase().getHealth(); // in case user healed, then later gets injured
- final long now = System.currentTimeMillis();
- if (now > timer_started + timer_delay) {
- try {
- teleport.cooldown(false);
- } catch (final Exception ex) {
- teleportOwner.sendTl("cooldownWithMessage", ex.getMessage());
- if (teleportOwner != teleportUser) {
- teleportUser.sendTl("cooldownWithMessage", ex.getMessage());
- }
- }
- try {
- cancelTimer(false);
- teleportUser.sendTl("teleportationCommencing");
-
- if (timer_chargeFor != null) {
- timer_chargeFor.isAffordableFor(teleportOwner);
- }
- if (timer_respawn) {
- teleport.respawnNow(teleportUser, timer_cause);
- } else {
- teleport.now(teleportUser, timer_teleportTarget, timer_cause);
- }
- if (timer_chargeFor != null) {
- timer_chargeFor.charge(teleportOwner);
- }
-
- } catch (final Exception ex) {
- ess.showError(teleportOwner.getSource(), ex, "\\ teleport");
- }
- }
- }
- }
-
- ess.scheduleSyncDelayedTask(new DelayedTeleportTask());
- }
-
- //If we need to cancelTimer a pending teleportPlayer call this method
- void cancelTimer(final boolean notifyUser) {
- if (timer_task == -1) {
- return;
- }
- try {
- ess.getServer().getScheduler().cancelTask(timer_task);
- if (notifyUser) {
- teleportOwner.sendTl("pendingTeleportCancelled");
- if (timer_teleportee != null && !timer_teleportee.equals(teleportOwner.getBase().getUniqueId())) {
- ess.getUser(timer_teleportee).sendTl("pendingTeleportCancelled");
- }
- }
- } finally {
- timer_task = -1;
- }
- }
-}
diff --git a/Essentials/src/main/java/com/earth2me/essentials/User.java b/Essentials/src/main/java/com/earth2me/essentials/User.java
index c5cf54e4576..df60ff776bf 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/User.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/User.java
@@ -63,8 +63,6 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
// User modules
private final IMessageRecipient messageRecipient;
private transient final AsyncTeleport teleport;
- @SuppressWarnings("deprecation")
- private transient final Teleport legacyTeleport;
// User command confirmation strings
private final Map<User, BigDecimal> confirmingPayments = new WeakHashMap<>();
@@ -109,8 +107,6 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
public User(final Player base, final IEssentials ess) {
super(base, ess);
teleport = new AsyncTeleport(this, ess);
- //noinspection deprecation
- legacyTeleport = new Teleport(this, ess);
if (isAfk()) {
afkPosition = this.getLocation();
}
@@ -377,13 +373,6 @@ public void requestTeleport(final User player, final boolean here) {
teleportRequestQueue.put(request.getName(), request);
}
- @SuppressWarnings("deprecation")
- @Override
- @Deprecated
- public boolean hasOutstandingTeleportRequest() {
- return getNextTpaRequest(false, false, false) != null;
- }
-
public Collection<String> getPendingTpaKeys() {
return teleportRequestQueue.keySet();
}
@@ -567,16 +556,6 @@ public AsyncTeleport getAsyncTeleport() {
return teleport;
}
- /**
- * @deprecated This API is not asynchronous. Use {@link User#getAsyncTeleport()}
- */
- @SuppressWarnings("deprecation")
- @Override
- @Deprecated
- public Teleport getTeleport() {
- return legacyTeleport;
- }
-
public long getLastOnlineActivity() {
return lastOnlineActivity;
}
diff --git a/Essentials/src/main/java/com/earth2me/essentials/api/IJails.java b/Essentials/src/main/java/com/earth2me/essentials/api/IJails.java
index 94947c9c298..f39179e3383 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/api/IJails.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/api/IJails.java
@@ -46,17 +46,6 @@ public interface IJails extends IConf {
*/
void removeJail(String jail) throws Exception;
- /**
- * Attempts to send the given user to the given jail
- *
- * @param user the user to send to jail
- * @param jail the jail to send the user to
- * @throws Exception if the user is offline or jail does not exist
- * @deprecated Use {@link IJails#sendToJail(IUser, String, CompletableFuture)}
- */
- @Deprecated
- void sendToJail(IUser user, String jail) throws Exception;
-
/**
* Attempts to send the given user to the given jail
*