TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 03:53:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix user comparison.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/commands/Commandfly.java
View file

@ -60,7 +60,7 @@ public class Commandfly extends EssentialsToggleCommand
} }
user.sendMessage(_("flyMode", _(enabled ? "enabled" : "disabled"), user.getDisplayName())); 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())); sender.sendMessage(_("flyMode", _(enabled ? "enabled" : "disabled"), user.getDisplayName()));
} }

2
Essentials/src/com/earth2me/essentials/commands/Commandgod.java
View file

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

2
Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java
View file

@ -56,7 +56,7 @@ public class Commandsocialspy extends EssentialsToggleCommand
user.sendMessage(_("socialSpy", user.getDisplayName(), enabled ? _("enabled") : _("disabled"))); 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"))); sender.sendMessage(_("socialSpy", user.getDisplayName(), enabled ? _("enabled") : _("disabled")));
} }

2
Essentials/src/com/earth2me/essentials/commands/Commandtpaall.java
View file

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

2
Essentials/src/com/earth2me/essentials/commands/Commandtpall.java
View file

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

2
Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java
View file

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