[PATCH] Realm viditelý jen pro GM

[Zachy 11]

Bata v1.0

[ToDo]

Auto lock the realm when GMServer = "1". so players can login to it by altering there client settings

Make it so players that have gm rights for a specific server can see that realm

 

[info]

This patch allows you to set a realm so only GMs can see it in the realm list. It will Automatically add [GM] to the front of the realm name telling you this server can only be viewed by GM+

 

[NOTE:This patch also includes two of my patches that are needed to run this patch properly. i will remove the other patches from this one as there added to the svn]

 

[When compiled, Replace all of your EXE Files or you will get errors.

You will also need to copy the ascent-realms.conf from your src folder]

 

Index: ascent-logonserver/AccountCache.cpp
===================================================================
--- ascent-logonserver/AccountCache.cpp	(revision 4106)
+++ ascent-logonserver/AccountCache.cpp	(working copy)
@@ -340,6 +340,17 @@
	return ret;
}

+int32 InformationCore::GetRealmIdByName(string Name)
+{
+	map<uint32, Realm*>::iterator itr = m_realms.begin();
+	HM_NAMESPACE::hash_map<uint32, uint8>::iterator it;
+	for(; itr != m_realms.end(); ++itr)
+		if (itr->second->Name == Name)
+		{
+			return itr->first;
+		}
+	return -1;
+}
void InformationCore::RemoveRealm(uint32 realm_id)
{
	realmLock.Acquire();
@@ -353,12 +364,26 @@
	realmLock.Release();
}

+void InformationCore::UpdateRealmStatus(uint32 realm_id, uint8 Color)
+{
+	    realmLock.Acquire();
+		map<uint32, Realm*>::iterator itr = m_realms.find(realm_id);
+		if(itr != m_realms.end())
+		{
+			itr->second->Colour = Color;
+		}
+		realmLock.Release();
+}
void InformationCore::SendRealms(AuthSocket * Socket)
{
	realmLock.Acquire();
+	uint32 RealmListSize = m_realms.size();

+	if(Socket->hasgmrights == false)
+		RealmListSize -= GetGMRealmCount();
+
	// packet header
-	ByteBuffer data(m_realms.size() * 150 + 20);
+	ByteBuffer data(RealmListSize * 150 + 20);
	data << uint8(0x10);
	data << uint16(0);	  // Size Placeholder

@@ -366,28 +391,38 @@
	data << uint32(0);

	//sAuthLogonChallenge_C * client = Socket->GetChallenge();
-	data << uint16(m_realms.size());
+	data << uint16(RealmListSize);

	// loop realms :/
	map<uint32, Realm*>::iterator itr = m_realms.begin();
	HM_NAMESPACE::hash_map<uint32, uint8>::iterator it;
	for(; itr != m_realms.end(); ++itr)
	{
-		data << uint8(itr->second->Icon);
-		data << uint8(0);				   // Locked Flag
-		data << uint8(itr->second->Colour);		
+		if(itr->second->GMServer != 1 || Socket->hasgmrights == true)
+		{
+		string Name;

+		data << itr->second->Icon;
+		//data << itr->second->Lock;  for use in later patch
+		data << uint8(0);		// delete when using data << itr->second->Lock;
+		data << itr->second->Colour;		
+
		// This part is the same for all.
-		data << itr->second->Name;
+		if ( itr->second->GMServer == 1 )	
+			Name = "[GM] " + itr->second->Name;	
+		else
+			Name = itr->second->Name;
+
+		data << Name;
		data << itr->second->Address;
-		//data << itr->second->Population;
-		data << uint32(0x3fa1cac1);
+		data << itr->second->Population;

		/* Get our character count */
		it = itr->second->CharacterMap.find(Socket->GetAccountID());
		data << uint8( (it == itr->second->CharacterMap.end()) ? 0 : it->second );
-		data << uint8(1);   // time zone
-		data << uint8(6);
+		data << itr->second->TimeZone;
+		data << uint8(6);    //Realm ID
+		}
	}
	realmLock.Release();

@@ -430,7 +465,7 @@
			s->removed = true;
			set<uint32>::iterator itr = s->server_ids.begin();
			for(; itr != s->server_ids.end(); ++itr)
-				RemoveRealm(*itr);
+				UpdateRealmStatus((*itr), 2);
			m_serverSockets.erase(it2);

			s->Disconnect();
@@ -439,3 +474,16 @@

	serverSocketLock.Release();
}
+
+uint32 InformationCore::GetGMRealmCount()
+{	   
+	uint32 Count = 0;
+	map<uint32, Realm*>::iterator itr = m_realms.begin();
+	HM_NAMESPACE::hash_map<uint32, uint8>::iterator it;
+	for(; itr != m_realms.end(); ++itr)
+		if (itr->second->GMServer == 1)
+		{
+			++Count;
+		}
+	return Count;
+}
\ No newline at end of file
Index: ascent-logonserver/AccountCache.h
===================================================================
--- ascent-logonserver/AccountCache.h	(revision 4106)
+++ ascent-logonserver/AccountCache.h	(working copy)
@@ -76,6 +76,13 @@
	char Locale[4];
	bool forcedLocale;

+	bool HasGMPermissions()
+	{
+		if(!GMFlags)
+			return false;
+
+		return (strchr(GMFlags,'a')!=NULL) ? true : false;
+	}
};

typedef struct 
@@ -179,10 +186,12 @@
{
	string Name;
	string Address;
-	uint32 Colour;
-	uint32 Icon;
-	uint32 TimeZone;
+	uint8 Colour;
+	uint8 Icon;
+	uint8 TimeZone;
	float Population;
+	uint8 Lock;
+	uint8 GMServer;
	HM_NAMESPACE::hash_map<uint32, uint8> CharacterMap;
}Realm;

@@ -213,14 +222,14 @@
	void		  SendRealms(AuthSocket * Socket);

	// Realm management
-	uint32 GenerateRealmID()
-	{
-		return ++realmhigh;
-	}
+	uint32 GenerateRealmID() { return ++realmhigh; }

	Realm*		  AddRealm(uint32 realm_id, Realm * rlm);
	Realm*        GetRealm(uint32 realm_id);
+	int32		  GetRealmIdByName(string Name);
	void		  RemoveRealm(uint32 realm_id);
+	void		  UpdateRealmStatus(uint32 realm_id, uint8 Color);
+	uint32		  GetGMRealmCount();

	ASCENT_INLINE void   AddServerSocket(LogonCommServerSocket * sock) { serverSocketLock.Acquire(); m_serverSockets.insert( sock ); serverSocketLock.Release(); }
	ASCENT_INLINE void   RemoveServerSocket(LogonCommServerSocket * sock) { serverSocketLock.Acquire(); m_serverSockets.erase( sock ); serverSocketLock.Release(); }
Index: ascent-logonserver/AuthSocket.cpp
===================================================================
--- ascent-logonserver/AuthSocket.cpp	(revision 4106)
+++ ascent-logonserver/AuthSocket.cpp	(working copy)
@@ -182,6 +182,7 @@
	sLog.outDebug("[AuthChallenge] Account Name: \"%s\"", AccountName.c_str());

	m_account = AccountMgr::getSingleton().GetAccount(AccountName);
+	hasgmrights = m_account->HasGMPermissions();
	if(m_account == 0)
	{
		sLog.outDebug("[AuthChallenge] Invalid account.");
Index: ascent-logonserver/AuthSocket.h
===================================================================
--- ascent-logonserver/AuthSocket.h	(revision 4106)
+++ ascent-logonserver/AuthSocket.h	(working copy)
@@ -65,6 +65,7 @@
	ASCENT_INLINE time_t GetLastRecv() { return last_recv; }
	bool removedFromSet;
	ASCENT_INLINE uint32 GetAccountID() { return m_account ? m_account->AccountId : 0; }
+	bool hasgmrights;

protected:

Index: ascent-logonserver/LogonCommServer.cpp
===================================================================
--- ascent-logonserver/LogonCommServer.cpp	(revision 4106)
+++ ascent-logonserver/LogonCommServer.cpp	(working copy)
@@ -47,12 +47,12 @@

void LogonCommServerSocket::OnDisconnect()
{
-	// if we're registered -> de-register
+	// if we're registered -> Set offline
	if(!removed)
	{
		set<uint32>::iterator itr = server_ids.begin();
		for(; itr != server_ids.end(); ++itr)
-			sInfoCore.RemoveRealm((*itr));
+			sInfoCore.UpdateRealmStatus((*itr), 2);

		sInfoCore.RemoveServerSocket(this);
	}
@@ -149,14 +149,29 @@

void LogonCommServerSocket::HandleRegister(WorldPacket & recvData)
{
+	string Name;
+	int32 my_id;
+
+	recvData >> Name;
+	my_id = sInfoCore.GetRealmIdByName(Name);
+	
+	if (my_id == -1)
+	{
+		my_id = sInfoCore.GenerateRealmID();
+		sLog.outString("Registering realm `%s` under ID %u.", Name.c_str(), my_id);
+	}
+	else 
+	{
+		sInfoCore.RemoveRealm(my_id);
+		sLog.outString("Updating realm `%s` under ID %u.", Name.c_str(), my_id);
+	}
+
	Realm * realm = new Realm;

-	recvData >> realm->Name >> realm->Address;
-	recvData >> realm->Colour >> realm->Icon >> realm->TimeZone >> realm->Population;
+	realm->Name = Name;
+	realm->Colour = 0;
+	recvData >> realm->Address >> realm->Icon >> realm->TimeZone >> realm->Population >> realm->Lock >> realm->GMServer;

-	uint32 my_id = sInfoCore.GenerateRealmID();
-	sLog.outString("Registering realm `%s` under ID %u.", realm->Name.c_str(), my_id);
-
	// Add to the main realm list
	sInfoCore.AddRealm(my_id, realm);

Index: ascent-realms.conf
===================================================================
--- ascent-realms.conf	(revision 4106)
+++ ascent-realms.conf	(working copy)
@@ -50,22 +50,23 @@
#    Icon:
#        The type of realm (PVP, Normal, RPPVP, RP)
#
-#    Colour:
-#        Realm colour in realm list display.
-#
#    TimeZone:
#        Time zone the realm is in.
#
#    Population:
#        (0 = low, 1 = medium, 2 = high)
+#	
+#    GMServer:
+#	 (0 = Allows all users to view this realm, 1 = only lets GM/Admin View the realm)
#
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#

<Realm1 Name = "Test Realm"
        Address = "127.0.0.1:8129"
        Icon = "PVP"
-        Colour = "1"
        Population = "1.0"
-        TimeZone = "1">
+        TimeZone = "1"
+	GMServer = "0">


+
Index: ascent-realmserver/LogonCommHandler.cpp
===================================================================
--- ascent-realmserver/LogonCommHandler.cpp	(revision 4106)
+++ ascent-realmserver/LogonCommHandler.cpp	(working copy)
@@ -61,10 +61,11 @@
		Realm * realm = *itr;
		data << realm->Name;
		data << realm->Address;
-		data << realm->Colour;
		data << realm->Icon;
		data << realm->TimeZone;
		data << realm->Population;
+		data << realm->Lock;
+		data << realm->GMServer;
		Socket->SendPacket(&data);
	}
}
@@ -324,10 +325,10 @@
			Realm * realm = new Realm;
			realm->Name = Config.RealmConfig.GetStringVA("Name", "SomeRealm", "Realm%u", i);
			realm->Address = Config.RealmConfig.GetStringVA("Address", "127.0.0.1:8129", "Realm%u", i);
-			realm->Colour = Config.RealmConfig.GetIntVA("Colour", 1, "Realm%u", i);
			realm->TimeZone = Config.RealmConfig.GetIntVA("TimeZone", 1, "Realm%u", i);
			realm->Population = Config.RealmConfig.GetFloatVA("Population", 0, "Realm%u", i);
			string rt = Config.RealmConfig.GetStringVA("Icon", "Normal", "Realm%u", i);
+			realm->GMServer = Config.RealmConfig.GetIntVA("GMServer", 0, "Realm%u", i);
			uint32 type;

			// process realm type
Index: ascent-realmserver/LogonCommHandler.h
===================================================================
--- ascent-realmserver/LogonCommHandler.h	(revision 4106)
+++ ascent-realmserver/LogonCommHandler.h	(working copy)
@@ -35,10 +35,11 @@
{
	string Name;
	string Address;
-	uint32 Colour;
-	uint32 Icon;
-	uint32 TimeZone;
+	uint8 Icon;
+	uint8 TimeZone;
	float Population;
+	uint8 Lock;
+	uint8 GMServer;
}Realm;

enum RealmType
@@ -113,3 +114,6 @@

#endif

+
+
+
Index: ascent-world/LogonCommHandler.cpp
===================================================================
--- ascent-world/LogonCommHandler.cpp	(revision 4106)
+++ ascent-world/LogonCommHandler.cpp	(working copy)
@@ -61,10 +61,11 @@
		Realm * realm = *itr;
		data << realm->Name;
		data << realm->Address;
-		data << realm->Colour;
		data << realm->Icon;
		data << realm->TimeZone;
		data << realm->Population;
+		data << realm->Lock;
+		data << realm->GMServer;
		Socket->SendPacket(&data,false);
	}
}
@@ -399,10 +400,10 @@
			Realm * realm = new Realm;
			realm->Name = Config.RealmConfig.GetStringVA("Name", "SomeRealm", "Realm%u", i);
			realm->Address = Config.RealmConfig.GetStringVA("Address", "127.0.0.1:8129", "Realm%u", i);
-			realm->Colour = Config.RealmConfig.GetIntVA("Colour", 1, "Realm%u", i);
			realm->TimeZone = Config.RealmConfig.GetIntVA("TimeZone", 1, "Realm%u", i);
			realm->Population = Config.RealmConfig.GetFloatVA("Population", 0, "Realm%u", i);
			string rt = Config.RealmConfig.GetStringVA("Icon", "Normal", "Realm%u", i);
+			realm->GMServer = Config.RealmConfig.GetIntVA("GMServer", 0, "Realm%u", i);
			uint32 type;

			// process realm type
Index: ascent-world/LogonCommHandler.h
===================================================================
--- ascent-world/LogonCommHandler.h	(revision 4106)
+++ ascent-world/LogonCommHandler.h	(working copy)
@@ -35,10 +35,11 @@
{
	string Name;
	string Address;
-	uint32 Colour;
-	uint32 Icon;
-	uint32 TimeZone;
+	uint8 Icon;
+	uint8 TimeZone;
	float Population;
+	uint8 Lock;
+	uint8 GMServer;
}Realm;

enum RealmType
@@ -124,3 +125,6 @@

#endif

+
+
+

 

DOWNLOAD - http://filebeam.com/973c6401978ce67ead57f8b1f812952a

 

By AscentEMU

Edited March 6, 2008 by Zachy