summaryrefslogtreecommitdiff
path: root/modules/hostserv
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2024-03-12 16:50:30 +0000
committerSadie Powell <sadie@witchery.services>2024-03-12 16:50:30 +0000
commitb8cd00b4122b7a243a2071268f2d395808782472 (patch)
tree4b821af9a8a9969a97f4ded5b995228937ac851d /modules/hostserv
parentb52e1b2b02c73195740ca836e21faeff281a36c2 (diff)
parentf4bd43e898e6ca415e22546f554e67139e62059e (diff)
Merge branch '2.0' into 2.1.
Diffstat (limited to 'modules/hostserv')
-rw-r--r--modules/hostserv/hs_group.cpp2
-rw-r--r--modules/hostserv/hs_set.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/hostserv/hs_group.cpp b/modules/hostserv/hs_group.cpp
index 2877fa16d..d28f00f7c 100644
--- a/modules/hostserv/hs_group.cpp
+++ b/modules/hostserv/hs_group.cpp
@@ -28,7 +28,7 @@ public:
setting = true;
for (auto *nick : *na->nc->aliases)
{
- if (nick)
+ if (nick && nick != na)
{
nick->SetVhost(na->GetVhostIdent(), na->GetVhostHost(), na->GetVhostCreator());
FOREACH_MOD(OnSetVhost, (nick));
diff --git a/modules/hostserv/hs_set.cpp b/modules/hostserv/hs_set.cpp
index 16e4cebf9..55f562e00 100644
--- a/modules/hostserv/hs_set.cpp
+++ b/modules/hostserv/hs_set.cpp
@@ -112,7 +112,7 @@ class CommandHSSetAll final
for (auto *nick : *na->nc->aliases)
{
- if (nick)
+ if (nick && nick != na)
nick->SetVhost(na->GetVhostIdent(), na->GetVhostHost(), na->GetVhostCreator());
}
}