Optimize some behaviour in the core (#1476).

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / ijoin.cpp

diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp
index 78e05db93fbb841090e5c18257bcdf9ecd42a2f7..c2dbcf7f5ae2f3cdcb444cec014507d3be36f737 100644 (file)
--- a/src/modules/m_spanningtree/ijoin.cpp
+++ b/src/modules/m_spanningtree/ijoin.cpp
@@ -38,12 +38,10 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, std::vector<std::string>&
        }
 
        bool apply_modes;
-       if (params.size() > 2)
+       if (params.size() > 3)
        {
                time_t RemoteTS = ServerCommand::ExtractTS(params[2]);
-               if (RemoteTS < chan->age)
-                       throw ProtocolException("Attempted to lower TS via IJOIN. LocalTS=" + ConvToStr(chan->age));
-               apply_modes = ((params.size() > 3) && (RemoteTS == chan->age));
+               apply_modes = (RemoteTS <= chan->age);
        }
        else
                apply_modes = false;