From 0a64e2667287973b0112a435e1d6200918a7d700 Mon Sep 17 00:00:00 2001
From: Alex King <89047260+Kinglykrab@users.noreply.github.com>
Date: Fri, 17 Mar 2023 06:21:14 -0400
Subject: [PATCH] [Cleanup] Remove FindCLEByLSID(), GetCLE(), GetCLEIPCount(),
 and RemoveCLEByLSID() from clientlist.h (#3098)

# Notes
- These are unused.
---
 world/clientlist.cpp | 66 --------------------------------------------
 world/clientlist.h   |  4 ---
 2 files changed, 70 deletions(-)

diff --git a/world/clientlist.cpp b/world/clientlist.cpp
index 2535a0955..225069e9b 100644
--- a/world/clientlist.cpp
+++ b/world/clientlist.cpp
@@ -85,19 +85,6 @@ void ClientList::CLERemoveZSRef(ZoneServer* iZS) {
 	}
 }
 
-ClientListEntry* ClientList::GetCLE(uint32 iID) {
-	LinkedListIterator<ClientListEntry*> iterator(clientlist);
-
-	iterator.Reset();
-	while(iterator.MoreElements()) {
-		if (iterator.GetData()->GetID() == iID) {
-			return iterator.GetData();
-		}
-		iterator.Advance();
-	}
-	return 0;
-}
-
 //Check current CLE Entry IPs against incoming connection
 
 void ClientList::GetCLEIP(uint32 in_ip) {
@@ -207,31 +194,6 @@ void ClientList::GetCLEIP(uint32 in_ip) {
 	}
 }
 
-uint32 ClientList::GetCLEIPCount(uint32 in_ip) {
-	ClientListEntry* cle = nullptr;
-	LinkedListIterator<ClientListEntry*> iterator(clientlist);
-
-	int count = 0;
-	iterator.Reset();
-
-	while (iterator.MoreElements()) {
-		cle = iterator.GetData();
-		if (
-			cle->GetIP() == in_ip &&
-			(
-				cle->Admin() < RuleI(World, ExemptMaxClientsStatus) ||
-				RuleI(World, ExemptMaxClientsStatus) < 0
-			) &&
-			cle->Online() >= CLE_Status::Online
-		) { // If the IP matches, and the connection admin status is below the exempt status, or exempt status is less than 0 (no-one is exempt)
-			count++; // Increment the occurences of this IP address
-		}
-		iterator.Advance();
-	}
-
-	return count;
-}
-
 void ClientList::DisconnectByIP(uint32 in_ip) {
 	ClientListEntry* cle = nullptr;
 	LinkedListIterator<ClientListEntry*> iterator(clientlist);
@@ -296,19 +258,6 @@ ClientListEntry* ClientList::FindCLEByCharacterID(uint32 iCharID) {
 	return nullptr;
 }
 
-ClientListEntry* ClientList::FindCLEByLSID(uint32 iLSID) {
-	LinkedListIterator<ClientListEntry*> iterator(clientlist);
-
-	iterator.Reset();
-	while (iterator.MoreElements()) {
-		if (iterator.GetData()->LSID() == iLSID) {
-			return iterator.GetData();
-		}
-		iterator.Advance();
-	}
-	return nullptr;
-}
-
 void ClientList::SendCLEList(const int16& admin, const char* to, WorldTCPConnection* connection, const char* iName) {
 	LinkedListIterator<ClientListEntry*> iterator(clientlist);
 	int x = 0, y = 0;
@@ -1314,21 +1263,6 @@ void ClientList::UpdateClientGuild(uint32 char_id, uint32 guild_id) {
 	}
 }
 
-void ClientList::RemoveCLEByLSID(uint32 iLSID)
-{
-	LinkedListIterator<ClientListEntry *> iterator(clientlist);
-
-	iterator.Reset();
-	while (iterator.MoreElements()) {
-		if (iterator.GetData()->LSAccountID() == iLSID) {
-			iterator.RemoveCurrent();
-		}
-		else {
-			iterator.Advance();
-		}
-	}
-}
-
 bool ClientList::IsAccountInGame(uint32 iLSID) {
 	LinkedListIterator<ClientListEntry*> iterator(clientlist);
 	iterator.Reset();
diff --git a/world/clientlist.h b/world/clientlist.h
index 37c740719..50ea5ab69 100644
--- a/world/clientlist.h
+++ b/world/clientlist.h
@@ -53,16 +53,12 @@ public:
 	ClientListEntry* FindCharacter(const char* name);
 	ClientListEntry* FindCLEByAccountID(uint32 iAccID);
 	ClientListEntry* FindCLEByCharacterID(uint32 iCharID);
-	ClientListEntry* FindCLEByLSID(uint32 iLSID);
-	ClientListEntry* GetCLE(uint32 iID);
 	void	GetCLEIP(uint32 in_ip);
-	uint32	GetCLEIPCount(uint32 iLSAccountID);
 	void	DisconnectByIP(uint32 in_ip);
 	void	CLCheckStale();
 	void	CLEKeepAlive(uint32 numupdates, uint32* wid);
 	void	CLEAdd(uint32 iLSID, const char* iLoginServerName, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin = AccountStatus::Player, uint32 ip = 0, uint8 local=0);
 	void	UpdateClientGuild(uint32 char_id, uint32 guild_id);
-	void	RemoveCLEByLSID(uint32 iLSID);
 	bool    IsAccountInGame(uint32 iLSID);
 
 	int GetClientCount();