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

Fix double messages in targeted commands

Browse source
This commit is contained in:
Chris Ward 2013-10-18 17:43:37 +11:00 • committed by KHobbits
parent 2615468a08
commit 50a9b5718c
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

@ -61,7 +61,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.getBase())) if (!sender.isPlayer() || !sender.getPlayer().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

@ -67,7 +67,7 @@ public class Commandgod extends EssentialsToggleCommand
} }
user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled"))); user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled")));
if (!sender.equals(user.getBase())) if (!sender.isPlayer() || !sender.getPlayer().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/Commandr.java
View file

@ -66,7 +66,7 @@ public class Commandr extends EssentialsCommand
{ {
if (target.isPlayer()) if (target.isPlayer())
{ {
(target.isPlayer() ? ess.getUser(target.getPlayer()) : ess.getUser(Console.NAME)).setReplyTo(sender); ess.getUser(target.getPlayer()).setReplyTo(sender);
} }
else else
{ {

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.getBase())) if (!sender.isPlayer() || !sender.getPlayer().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/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.getBase())) if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase()))
{ {
sender.sendMessage(enabled ? _("teleportationEnabledFor", user.getDisplayName()) : _("teleportationDisabledFor", user.getDisplayName())); sender.sendMessage(enabled ? _("teleportationEnabledFor", user.getDisplayName()) : _("teleportationDisabledFor", user.getDisplayName()));
} }

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

@ -59,7 +59,7 @@ public class Commandvanish extends EssentialsToggleCommand
{ {
user.sendMessage(_("vanished")); user.sendMessage(_("vanished"));
} }
if (!sender.equals(user.getBase())) if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase()))
{ {
sender.sendMessage(_("vanish", user.getDisplayName(), enabled ? _("enabled") : _("disabled"))); sender.sendMessage(_("vanish", user.getDisplayName(), enabled ? _("enabled") : _("disabled")));
} }