1 files changed, 38 insertions, 11 deletions

diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index dc5261403..d2b5b935a 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -558,11 +558,12 @@ struct IRCDMessageCertFP: IRCDMessage
 		User *u = source.GetUser();
 
 		u->fingerprint = params[0];
-		FOREACH_MOD(OnFingerprint, (u));
+		Event::OnFingerprint(&Event::Fingerprint::OnFingerprint, u);
 	}
 };
 
 class ProtoHybrid : public Module
+	, public EventHook<Event::UserNickChange>
 {
 	HybridProto ircd_proto;
 
@@ -651,16 +652,42 @@ class ProtoHybrid : public Module
 	}
 
 public:
-	ProtoHybrid(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
-		ircd_proto(this),
-		message_away(this), message_capab(this), message_error(this), message_invite(this), message_kick(this),
-		message_kill(this), message_mode(this), message_motd(this), message_notice(this), message_part(this),
-		message_ping(this), message_privmsg(this), message_quit(this), message_squit(this), message_stats(this),
-		message_time(this), message_topic(this), message_version(this), message_whois(this),
-		message_bmask(this), message_eob(this), message_join(this),
-		message_nick(this), message_pass(this), message_pong(this), message_server(this), message_sid(this),
-		message_sjoin(this), message_svsmode(this), message_tburst(this), message_tmode(this), message_uid(this),
-		message_certfp(this)
+	ProtoHybrid(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR)
+		, EventHook<Event::UserNickChange>("OnUserNickChange")
+		, ircd_proto(this)
+		, message_away(this)
+		, message_capab(this)
+		, message_error(this)
+		, message_invite(this)
+		, message_kick(this)
+		, message_kill(this)
+		, message_mode(this)
+		, message_motd(this)
+		, message_notice(this)
+		, message_part(this)
+		, message_ping(this)
+		, message_privmsg(this)
+		, message_quit(this)
+		, message_squit(this)
+		, message_stats(this)
+		, message_time(this)
+		, message_topic(this)
+		, message_version(this)
+		, message_whois(this)
+		, message_bmask(this)
+		, message_eob(this)
+		, message_join(this)
+		, message_nick(this)
+		, message_pass(this)
+		, message_pong(this)
+		, message_server(this)
+		, message_sid(this)
+		, message_sjoin(this)
+		, message_svsmode(this)
+		, message_tburst(this)
+		, message_tmode(this)
+		, message_uid(this)
+		, message_certfp(this)
 	{
 		if (Config->GetModule(this))
 			this->AddModes();