VGOEmulator.net

Code: Select all

Index: D:/dev/vg/VGO/trunk/src/world/ChunkServer.cpp
===================================================================
--- D:/dev/vg/VGO/trunk/src/world/ChunkServer.cpp	(revision 1253)
+++ D:/dev/vg/VGO/trunk/src/world/ChunkServer.cpp	(revision 1254)
@@ -795,7 +795,7 @@
 					case OP_ClientBrotherhoodPromote:
 						HandleClientBrotherhoodPromote(client, packet_struct);
 						break;
-					case OP_ClientBrotherhoodMotd:
+					case OP_ClientBrotherhoodMOTD:
 						HandleClientBrotherhoodMotd(client, packet_struct);
 						break;
 					case OP_ClientBrotherhoodNote:
@@ -1237,38 +1237,47 @@
 			client->SetCharacter(character);
 			character_list.SetCharacter(str_name, character);
 		}
+
 		character->SetZoning(true);
 		character->SetProcessingAuthConfirmPacket(true);
 		chunk_character_list.SetCharacter(str_name, character);
 		character->SetCurrentChunk(shared_from_this());
+
+		if (!character->GetOneTimeSent()){
+			auto controller = character->GetController();
+			controller->SetPlayer(character);
+		}
+
+		SendPlayerControllerInitPackets(client);
+		SendPlayerInitPackets(client);
+		SendAssignControllerToPlayerPacket(client);
+
+		// Send ordered packets 
+		CheckPlayerChangedContinents(client, character); // Send & Check ChatChannels
+
+		if (!character->GetOneTimeSent())
+			guilds_list.SendGuildPCInfo(client, character); // Send guild updates
+
 		SendUnknown_1430(client);
+
+		if (!character->GetOneTimeSent())
+			SendMOTD(client); // Send MOTD
+
 		SendUnknown_602(client);
 
-		auto wclient = net.GetClient(character->GetAccountID());
-		CheckPlayerChangedContinents(wclient, character);
-		if (!character->GetOneTimeSent()){
-			net.SendFriendInfo(client);
-			net.SendIgnoreInfo(client);
-			//character->SendChatChannels();
-			//auto global_chat = character->GetAvailableChatChannelByName("NewTelon");
-			//if (global_chat){
-			//	character->JoinChatChannel(global_chat, wclient, true);
-			//}
-			if (rule_manager.GetGlobalRule(R_World, HeraldLogins)->GetBool())
-				SendPlayerOnlineMessage(client);
+		if (!character->GetOneTimeSent()) {
 			SendServerPcEntityID(client);
-			SendServerPcUniqueID2(client);
 			SendServerPcUniqueID(client);
 			SendUnknown_1582(client);
-			//SendUnknown_1156(client);
-			SendServerClassShowsDamageHealing(client); //280
+			SendServerPcUniqueID2(client);
+
+			SendUnknown_1156(client);
+			SendServerClassShowsDamageHealing(client); // 280
+			SendServerPlayerIconLevel(client); // 281
+			SendServerUse250System(client); // 282
 			SendUnknown_539(client);
 			SendUnknown_541(client);
-			character->SendMoneyBalance();
-			// Guild info -- Not sure if this should be here.
-			SendGuildAndRank(client, character);
 
-
 #ifdef VG_DEBUG
 			if (rule_manager.GetGlobalRule(R_Dev, ProcessAbilities)->GetInt32()==0) {
 			} else 
@@ -1280,34 +1289,41 @@
 					LogError(LOG_DATABASE, 0, "ClientAuthConfirm: Failed to send forms to client for character.");
 			}
 
-			character->PushDungeonsToClient();
-			character->SendEquipGearBonusFlag();
 			SendUnknown_542(client);
+			character->SendMoneyBalance();
+			SendUnknown_960(client);
+			SendGuildAndRank(client, character); // Guild info
+			SendUnknown_722(client);
+
 			SendCharacterInfo(client, character);
+
 			character->SendAdventurePoints();
 			character->SendCraftingPoints();
+
+			SendUnknown_673(client);
+			SendUnknown_918(client);
+		}
+
+		SendUnknown_1032(client);
+		SendUnknown_1033(client);
+		character->PushDungeonsToClient();		
+		SendUnknown_1157(client);
+
+		if (!character->GetOneTimeSent()){
+			character->SendEquipGearBonusFlag();
+			net.SendFriendInfo(client);
+			net.SendIgnoreInfo(client);
+			if (rule_manager.GetGlobalRule(R_World, HeraldLogins)->GetBool())
+				SendPlayerOnlineMessage(client);
+
 			character->SetOneTimeSent(true);
 
-			auto controller = character->GetController();
-			controller->SetPlayer(character);
-
-			// Send MOTD
-			SendMOTD(client);
-			// Send guild_motd
-			guilds_list.SendGuildMotd(client, character);
+			guilds_list.SendGuildMotd(client, character); // Send guild_motd
 		}
-		//if (CheckPlayerChangedContinents(wclient, character)); //Something wrong with this channel is getting unchecked
-			//character->SendChatChannels(); //Sending channels twice  more research need's to be done when chunking
 	}
-	SendPlayerControllerInitPackets(client);
-	SendPlayerInitPackets(client);
-	SendAssignControllerToPlayerPacket(client);
-	SendUnknown_1032(client);
-	SendUnknown_1033(client);
-	SendUnknown_1157(client);
+
 	SendAll3ds(client);
 	net.TellAllFriends(client);
-
 	HandleClientFlying(client);
 	//SendAllMovers(client); // This was previously used to send all movers in a chunk to a connecting player. We now send movers based on proximity.
 	client->SetPlayerGhostsSent(true);
@@ -1325,10 +1341,10 @@
 		// Show equipped items on character
 		character->CharShowEquippedItems();
 
-		// Send guild updates
-		guilds_list.SendGuildPCInfo(client, character);
+		//guilds_list.SendGuildMotd(client, character); // Send guild_motd
 	}
 
+	return;
 }