Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 1290e998039ef3c41f1677d23547db1775e02142..88092687af1bd791b1ae2816e785bea24c24eb48 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -44,7 +44,7 @@ class joinfloodsettings : public classbase
 
        joinfloodsettings(int b, int c) : secs(b), joins(c)
        {
-               reset = ServerInstance->Time() + secs;
+               reset = time(NULL) + secs;
                counter = 0;
                locked = false;
        };
@@ -52,10 +52,10 @@ class joinfloodsettings : public classbase
        void addjoin()
        {
                counter++;
-               if (ServerInstance->Time() > reset)
+               if (time(NULL) > reset)
                {
                        counter = 0;
-                       reset = ServerInstance->Time() + secs;
+                       reset = time(NULL) + secs;
                }
        }
 
@@ -73,7 +73,7 @@ class joinfloodsettings : public classbase
        {
                if (locked)
                {
-                       if (ServerInstance->Time() > unlocktime)
+                       if (time(NULL) > unlocktime)
                        {
                                locked = false;
                                return false;
@@ -89,7 +89,7 @@ class joinfloodsettings : public classbase
        void lock()
        {
                locked = true;
-               unlocktime = ServerInstance->Time() + 60;
+               unlocktime = time(NULL) + 60;
        }
 
 };
@@ -285,7 +285,7 @@ class ModuleJoinFlood : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };