diff --git a/core/logic/smn_admin.cpp b/core/logic/smn_admin.cpp index 24a8f35b..cac4f96b 100644 --- a/core/logic/smn_admin.cpp +++ b/core/logic/smn_admin.cpp @@ -594,7 +594,6 @@ REGISTER_NATIVES(adminNatives) {"AdminId.GetGroup", GetAdminGroup}, {"AdminId.SetPassword", SetAdminPassword}, {"AdminId.GetPassword", GetAdminPassword}, - {"AdminId.Purge", RemoveAdmin}, {"AdminId.CanTarget", CanAdminTarget}, {"AdminId.GroupCount.get", GetAdminGroupCount}, {"AdminId.ImmunityLevel.get", GetAdminImmunityLevel}, diff --git a/plugins/admin-flatfile/admin-simple.sp b/plugins/admin-flatfile/admin-simple.sp index e03757a5..57120c2a 100644 --- a/plugins/admin-flatfile/admin-simple.sp +++ b/plugins/admin-flatfile/admin-simple.sp @@ -219,7 +219,7 @@ void ReadAdminLine(const char[] line) if (!admin.BindIdentity(auth_method, auth[auth_offset])) { /* We should never reach here */ - admin.Purge(); + RemoveAdmin(admin); ParseError("Failed to bind identity %s (method %s)", auth[auth_offset], auth_method); } } diff --git a/plugins/admin-sql-threaded.sp b/plugins/admin-sql-threaded.sp index c36a1e88..36aa3ba5 100644 --- a/plugins/admin-sql-threaded.sp +++ b/plugins/admin-sql-threaded.sp @@ -366,7 +366,7 @@ public void OnReceiveUser(Database db, DBResultSet rs, const char[] error, any d /* For dynamic admins we clear anything already in the cache. */ if ((adm = FindAdminByIdentity(authtype, identity)) != INVALID_ADMIN_ID) { - adm.Purge(); + RemoveAdmin(adm); } adm = CreateAdmin(name); diff --git a/plugins/include/admin.inc b/plugins/include/admin.inc index afe9beeb..e988e58c 100644 --- a/plugins/include/admin.inc +++ b/plugins/include/admin.inc @@ -236,13 +236,6 @@ methodmap AdminId { // @return True if there was a password set, false otherwise. public native bool GetPassword(char[] buffer="", maxlength=0); - // Purges an admin entry from the cache. - // - // @note This will remove any bindings to a specific user. - // - // @return True on success, false otherwise. - public native bool Purge(); - // Tests whether one admin can target another. // // The heuristics for this check are as follows: