diff options
| author | Adam <Adam@anope.org> | 2013-08-07 15:03:11 +0000 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-08-07 15:03:11 +0000 |
| commit | 1efd289488ca16c895f833cded995d34b95daae1 (patch) | |
| tree | a5c3832cb2e7400c8e34344702db6d7373d20dac /modules/commands/os_jupe.cpp | |
| parent | 83e4b183eafdcf7cef1eba4dadf1d1de86c59457 (diff) | |
Fix inspircd jupe mess again, it wasn't working when juping servers that didn't already exist
Diffstat (limited to 'modules/commands/os_jupe.cpp')
| -rw-r--r-- | modules/commands/os_jupe.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/commands/os_jupe.cpp b/modules/commands/os_jupe.cpp index de6fa76f4..f631bac41 100644 --- a/modules/commands/os_jupe.cpp +++ b/modules/commands/os_jupe.cpp @@ -28,8 +28,10 @@ class CommandOSJupe : public Command if (!IRCD->IsHostValid(jserver) || jserver.find('.') == Anope::string::npos) source.Reply(_("Please use a valid server name when juping.")); - else if (server && (server == Me || server == Me->GetLinks().front())) + else if (server == Me || server == Servers::GetUplink()) source.Reply(_("You can not jupe your Services' pseudoserver or your uplink server.")); + else if (server && server->IsJuped()) + source.Reply(_("You can not jupe an already juped server.")); else { Anope::string rbuf = "Juped by " + source.GetNick() + (!reason.empty() ? ": " + reason : ""); @@ -45,7 +47,6 @@ class CommandOSJupe : public Command Log(LOG_ADMIN, source, this) << "on " << jserver << " (" << rbuf << ")"; } - return; } bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override |