Fix user comparison.

This commit is contained in:
KHobbits 2013-07-09 09:08:26 +01:00
parent 427d8cc4e0
commit 3377e3483d
6 changed files with 6 additions and 6 deletions

View file

@ -60,7 +60,7 @@ public class Commandfly extends EssentialsToggleCommand
}
user.sendMessage(_("flyMode", _(enabled ? "enabled" : "disabled"), user.getDisplayName()));
if (!sender.equals(user))
if (!sender.equals(user.getBase()))
{
sender.sendMessage(_("flyMode", _(enabled ? "enabled" : "disabled"), user.getDisplayName()));
}

View file

@ -61,7 +61,7 @@ public class Commandgod extends EssentialsToggleCommand
}
user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled")));
if (!sender.equals(user))
if (!sender.equals(user.getBase()))
{
sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName())));
}

View file

@ -56,7 +56,7 @@ public class Commandsocialspy extends EssentialsToggleCommand
user.sendMessage(_("socialSpy", user.getDisplayName(), enabled ? _("enabled") : _("disabled")));
if (!sender.equals(user))
if (!sender.equals(user.getBase()))
{
sender.sendMessage(_("socialSpy", user.getDisplayName(), enabled ? _("enabled") : _("disabled")));
}

View file

@ -45,7 +45,7 @@ public class Commandtpaall extends EssentialsCommand
{
continue;
}
if (target.equals(sender)
if (sender.equals(target.getBase())
&& target.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !target.isAuthorized("essentials.worlds." + target.getWorld().getName()))
{

View file

@ -42,7 +42,7 @@ public class Commandtpall extends EssentialsCommand
{
continue;
}
if (target.equals(sender)
if (sender.equals(target.getBase())
&& target.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions()
&& !target.isAuthorized("essentials.worlds." + target.getWorld().getName()))
{

View file

@ -55,7 +55,7 @@ public class Commandtptoggle extends EssentialsToggleCommand
user.setTeleportEnabled(enabled);
user.sendMessage(enabled ? _("teleportationEnabled") : _("teleportationDisabled"));
if (!sender.equals(user))
if (!sender.equals(user.getBase()))
{
sender.sendMessage(enabled ? _("teleportationEnabledFor", user.getDisplayName()) : _("teleportationDisabledFor", user.getDisplayName()));
}