From 70390ff1f704df5dc1a210076d27322411b99165 Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <nshastings@gmail.com>
Date: Thu, 5 Mar 2015 10:56:36 -0800
Subject: [PATCH] Purge Purge.

---
 core/logic/smn_admin.cpp               | 1 -
 plugins/admin-flatfile/admin-simple.sp | 2 +-
 plugins/admin-sql-threaded.sp          | 2 +-
 plugins/include/admin.inc              | 7 -------
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/core/logic/smn_admin.cpp b/core/logic/smn_admin.cpp
index 24a8f35bf..cac4f96ba 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 e03757a5a..57120c2ae 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 c36a1e886..36aa3ba51 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 afe9beebc..e988e58cd 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: