From 96befc58f073b4f96771b57d728b16742294c2fe Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 22 Dec 2020 03:53:00 +0000
Subject: Send RPL_SAVENICK from irc2 when renaming a user to their UUID.

---
 src/modules/m_spanningtree/svsnick.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/modules/m_spanningtree')

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index e9292f445..8d1bc80ba 100644
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -67,6 +67,7 @@ CmdResult CommandSVSNick::Handle(User* user, Params& parameters)
 		if (!u->ChangeNick(nick, NickTS))
 		{
 			// Changing to 'nick' failed (it may already be in use), change to the uuid
+			u->WriteNumeric(RPL_SAVENICK, u->uuid, "Your nickname is in use by an older user on a new server.");
 			u->ChangeNick(u->uuid);
 		}
 	}
-- 
cgit v1.3.1-10-gc9f91


From e8f3587b80c26ee4fbd160db9a83ed8914a63e22 Mon Sep 17 00:00:00 2001
From: Matt Schatz
Date: Wed, 30 Dec 2020 09:55:28 -0700
Subject: Disallow an empty last parameter in MAP.

---
 src/modules/m_spanningtree/override_map.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/modules/m_spanningtree')

diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 5122fd0ed..edc4b0a12 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -36,6 +36,7 @@
 CommandMap::CommandMap(Module* Creator)
 	: Command(Creator, "MAP", 0, 1)
 {
+	allow_empty_last_param = false;
 	Penalty = 2;
 }
 
-- 
cgit v1.3.1-10-gc9f91