Made access del by nick and other functions from 326f1a really delete objects

4 files changed, 5 insertions, 5 deletions

diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 5cbe3024e..28e5fbf7b 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -286,7 +286,7 @@ class CommandCSAccess : public Command
 						Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to delete " << access->mask;
 
 						FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, source, access));
-						ci->EraseAccess(access);
+						access->Destroy();
 					}
 					return;
 				}
diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp
index 9824ab22f..6eb8c7721 100644
--- a/modules/commands/cs_flags.cpp
+++ b/modules/commands/cs_flags.cpp
@@ -180,7 +180,7 @@ class CommandCSFlags : public Command
 			if (current != NULL)
 			{
 				FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, source, current));
-				ci->EraseAccess(current);
+				current->Destroy();
 				Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to delete " << mask;
 				source.Reply(_("\002%s\002 removed from the %s access list."), mask.c_str(), ci->name.c_str());
 			}
@@ -203,7 +203,7 @@ class CommandCSFlags : public Command
 		access->flags = current_flags;
 
 		if (current != NULL)
-			ci->EraseAccess(current);
+			current->Destroy();
 
 		ci->AddAccess(access);
 
diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp
index 72197aeec..d0ad0a049 100644
--- a/modules/commands/cs_xop.cpp
+++ b/modules/commands/cs_xop.cpp
@@ -411,7 +411,7 @@ class XOPBase : public Command
 					source.Reply(_("\002%s\002 deleted from %s %s list."), a->mask.c_str(), ci->name.c_str(), source.command.c_str());
 
 					FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, source, a));
-					ci->EraseAccess(a);
+					a->Destroy();
 
 					return;
 				}
diff --git a/modules/extra/webcpanel/pages/chanserv/access.cpp b/modules/extra/webcpanel/pages/chanserv/access.cpp
index 23644efb1..235a49d1c 100644
--- a/modules/extra/webcpanel/pages/chanserv/access.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/access.cpp
@@ -70,7 +70,7 @@ bool WebCPanel::ChanServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 							denied = true;
 						}
 						else
-							ci->EraseAccess(acc);
+							acc->Destroy();
 						break;
 					}
 				}