X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_joinflood.cpp;h=31d0b4e8483c276e098b4ab666abffc5c3233cd1;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=cb8c90e098a155b23cabb5314c0b541dcf0352e4;hpb=d2a71fd3447c8bac65cc26077e2b9fc3fb0b28a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index cb8c90e09..31d0b4e84 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -97,12 +97,6 @@ class JoinFlood : public ModeHandler
 			return std::make_pair(false, parameter);
 	}
 
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
-	{
-		/* When TS is equal, the alphabetically later one wins */
-		return (their_param < our_param);
-	}
-
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		joinfloodsettings* dummy;
@@ -203,16 +197,15 @@ class JoinFlood : public ModeHandler
 class ModuleJoinFlood : public Module
 {
 
-	JoinFlood* jf;
+	JoinFlood jf;
 
  public:
 
 	ModuleJoinFlood(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), jf(Me)
 	{
 
-		jf = new JoinFlood(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(jf))
+		if (!ServerInstance->Modes->AddMode(&jf))
 			throw ModuleException("Could not add new modes!");
 		Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
@@ -235,7 +228,7 @@ class ModuleJoinFlood : public Module
 		return 0;
 	}
 
-	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
+	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created)
 	{
 		joinfloodsettings *f;
 
@@ -269,8 +262,7 @@ class ModuleJoinFlood : public Module
 
 	virtual ~ModuleJoinFlood()
 	{
-		ServerInstance->Modes->DelMode(jf);
-		delete jf;
+		ServerInstance->Modes->DelMode(&jf);
 	}
 
 	virtual Version GetVersion()