diff options
| author |  Sadie Powell | 2020-05-05 22:03:14 +0100 |
|---|---|---|
| committer | Sadie Powell | 2020-05-05 22:03:14 +0100 |
| commit | b755d2a778e0adb86c3b10757083c169eedb6de6 (patch) | |
| tree | 3d737ea47c535c4b60076feb26055e68f7d8aec5 /src/users.cpp | |
| parent | Revert "Convert UserType to an enum class". (diff) | |
| parent | Fix shuns not being applied correctly. (diff) | |
| download | inspircd++-b755d2a778e0adb86c3b10757083c169eedb6de6.tar.gz inspircd++-b755d2a778e0adb86c3b10757083c169eedb6de6.tar.bz2 inspircd++-b755d2a778e0adb86c3b10757083c169eedb6de6.zip | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/users.cpp')
| -rw-r--r-- | src/users.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/users.cpp b/src/users.cpp index 5837d2412..85685ec90 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -4,8 +4,7 @@ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com> * Copyright (C) 2018 systocrat <systocrat@outlook.com> * Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw> - * Copyright (C) 2014 satmd <satmd@lain.at> - * Copyright (C) 2013-2014, 2016-2019 Sadie Powell <sadie@witchery.services> + * Copyright (C) 2013, 2016-2020 Sadie Powell <sadie@witchery.services> * Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org> * Copyright (C) 2013 ChrisTX <xpipe@hotmail.de> * Copyright (C) 2013 Adam <Adam@anope.org> @@ -575,7 +574,7 @@ void LocalUser::FullConnect() /* * You may be thinking "wtf, we checked this in User::AddClient!" - and yes, we did, BUT. * At the time AddClient is called, we don't have a resolved host, by here we probably do - which - * may put the user into a totally seperate class with different restrictions! so we *must* check again. + * may put the user into a totally separate class with different restrictions! so we *must* check again. * Don't remove this! -- w00t */ MyClass = NULL; |