summaryrefslogtreecommitdiffstats
path: root/Essentials/src/net/ess3/commands/Commandtpall.java
diff options
context:
space:
mode:
Diffstat (limited to 'Essentials/src/net/ess3/commands/Commandtpall.java')
-rw-r--r--Essentials/src/net/ess3/commands/Commandtpall.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java
index 107db6bcd..aea8b1403 100644
--- a/Essentials/src/net/ess3/commands/Commandtpall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpall.java
@@ -4,10 +4,9 @@ import lombok.Cleanup;
import static net.ess3.I18n._;
import net.ess3.api.ISettings;
import net.ess3.api.IUser;
-import net.ess3.api.server.CommandSender;
-import net.ess3.api.server.Player;
import net.ess3.permissions.WorldPermissions;
-//TODO: remove bukkit
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -44,14 +43,14 @@ public class Commandtpall extends EssentialsCommand
ISettings settings = ess.getSettings();
settings.acquireReadLock();
- if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
- && !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user))
+ if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
+ && !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
{
continue;
}
try
{
- player.getTeleport().now(user, false, TeleportCause.COMMAND);
+ player.getTeleport().now(user.getPlayer(), false, TeleportCause.COMMAND);
}
catch (Exception ex)
{