diff options
| author | Chris Ward <chris@chrisgward.com> | 2013-10-18 17:43:37 +1100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-10-19 12:19:37 +0100 |
| commit | 2924125db3658eb87a8de978f83eed6e3dd0f8e7 (patch) | |
| tree | 40026c3fc3c3e4dbdb2489e46a0c0e20d708124e | |
| parent | f19293c4d4f04510b0bcff5c6ad0aa5fead86f0d (diff) | |
| download | Essentials-2924125db3658eb87a8de978f83eed6e3dd0f8e7.tar Essentials-2924125db3658eb87a8de978f83eed6e3dd0f8e7.tar.gz Essentials-2924125db3658eb87a8de978f83eed6e3dd0f8e7.tar.lz Essentials-2924125db3658eb87a8de978f83eed6e3dd0f8e7.tar.xz Essentials-2924125db3658eb87a8de978f83eed6e3dd0f8e7.zip | |
Fix double messages in targeted commands
6 files changed, 6 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java b/Essentials/src/com/earth2me/essentials/commands/Commandfly.java index 8d38f08dd..dcd1d5187 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfly.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandfly.java @@ -61,7 +61,7 @@ public class Commandfly extends EssentialsToggleCommand } 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())); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java index 439584667..44d930cc7 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java @@ -67,7 +67,7 @@ public class Commandgod extends EssentialsToggleCommand } 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()))); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java index 046024c7c..4b4de6ff9 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java @@ -66,7 +66,7 @@ public class Commandr extends EssentialsCommand { if (target.isPlayer()) { - (target.isPlayer() ? ess.getUser(target.getPlayer()) : ess.getUser(Console.NAME)).setReplyTo(sender); + ess.getUser(target.getPlayer()).setReplyTo(sender); } else { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java b/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java index e288a5cb0..63d3764be 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java @@ -56,7 +56,7 @@ public class Commandsocialspy extends EssentialsToggleCommand 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"))); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java b/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java index 442f53554..97052876b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtptoggle.java @@ -55,7 +55,7 @@ public class Commandtptoggle extends EssentialsToggleCommand user.setTeleportEnabled(enabled); 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())); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java b/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java index 588c17883..34aa82f64 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandvanish.java @@ -59,7 +59,7 @@ public class Commandvanish extends EssentialsToggleCommand { user.sendMessage(_("vanished")); } - if (!sender.equals(user.getBase())) + if (!sender.isPlayer() || !sender.getPlayer().equals(user.getBase())) { sender.sendMessage(_("vanish", user.getDisplayName(), enabled ? _("enabled") : _("disabled"))); } |