Working zone and world communication yay

world/adventure.cpp

@@ -177,7 +177,6 @@ void Adventure::SetStatus(AdventureStatus new_status)
 		ut->instance_id = instance_id;
 		ut->new_duration = adventure_template->duration + 60;
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(0, instance_id, pack);
 		safe_delete(pack);
 	}
@@ -192,7 +191,6 @@ void Adventure::SetStatus(AdventureStatus new_status)
 		ut->instance_id = instance_id;
 		ut->new_duration = 1860;
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(0, instance_id, pack);
 		safe_delete(pack);
 	}
@@ -207,7 +205,6 @@ void Adventure::SetStatus(AdventureStatus new_status)
 		ut->instance_id = instance_id;
 		ut->new_duration = 1860;
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(0, instance_id, pack);
 		safe_delete(pack);
 	}
@@ -313,7 +310,7 @@ void Adventure::Finished(AdventureWinStatus ws)
 					af->win = false;
 					af->points = 0;
 				}
-				pack->Deflate();
+
 				zoneserver_list.SendPacket(current->zone(), current->instance(), pack);
 				database.UpdateAdventureStatsEntry(database.GetCharacterID((*iter).c_str()), GetTemplate()->theme, (ws != AWS_Lose) ? true : false);
 				delete pack;

world/adventure_manager.cpp

@@ -83,7 +83,6 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 		ServerAdventureRequestDeny_Struct *deny = (ServerAdventureRequestDeny_Struct*)pack->pBuffer;
 		strcpy(deny->leader, sar->leader);
 		strcpy(deny->reason, "There are currently no adventures set for this theme.");
-		pack->Deflate();
 		zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack);
 		delete pack;
 		return;
@@ -113,7 +112,6 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 					ss << (data + sizeof(ServerAdventureRequest_Struct) + (64 * i)) << " is already apart of an active adventure.";
 
 					strcpy(deny->reason, ss.str().c_str());
-					pack->Deflate();
 					zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack);
 					delete pack;
 					return;
@@ -245,7 +243,6 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 		ServerAdventureRequestDeny_Struct *deny = (ServerAdventureRequestDeny_Struct*)pack->pBuffer;
 		strcpy(deny->leader, sar->leader);
 		strcpy(deny->reason, "The number of found players for this adventure was zero.");
-		pack->Deflate();
 		zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack);
 		delete pack;
 		return;
@@ -263,7 +260,6 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 		ss << "The maximum level range for this adventure is " << RuleI(Adventure, MaxLevelRange);
 		ss << " but the level range calculated was " << (max_level - min_level) << ".";
 		strcpy(deny->reason, ss.str().c_str());
-		pack->Deflate();
 		zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack);
 		delete pack;
 		return;
@@ -341,7 +337,6 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 		sra->id = (*ea_iter)->id;
 		sra->member_count = sar->member_count;
 		memcpy((pack->pBuffer + sizeof(ServerAdventureRequestAccept_Struct)), (data + sizeof(ServerAdventureRequest_Struct)), (sar->member_count * 64));
-		pack->Deflate();
 		zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack);
 		delete pack;
 		return;
@@ -352,7 +347,6 @@ void AdventureManager::CalculateAdventureRequestReply(const char *data)
 		ServerAdventureRequestDeny_Struct *deny = (ServerAdventureRequestDeny_Struct*)pack->pBuffer;
 		strcpy(deny->leader, sar->leader);
 		strcpy(deny->reason, "The number of adventures returned was zero.");
-		pack->Deflate();
 		zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack);
 		delete pack;
 		return;
@@ -373,7 +367,6 @@ void AdventureManager::TryAdventureCreate(const char *data)
 	{
 		auto pack = new ServerPacket(ServerOP_AdventureCreateDeny, 64);
 		strcpy((char*)pack->pBuffer, src->leader);
-		pack->Deflate();
 		zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack);
 		delete pack;
 		return;
@@ -384,7 +377,6 @@ void AdventureManager::TryAdventureCreate(const char *data)
 	{
 		auto pack = new ServerPacket(ServerOP_AdventureCreateDeny, 64);
 		strcpy((char*)pack->pBuffer, src->leader);
-		pack->Deflate();
 		zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack);
 		delete pack;
 		delete adv;
@@ -398,7 +390,6 @@ void AdventureManager::TryAdventureCreate(const char *data)
 		{
 			auto pack = new ServerPacket(ServerOP_AdventureCreateDeny, 64);
 			strcpy((char*)pack->pBuffer, src->leader);
-			pack->Deflate();
 			zoneserver_list.SendPacket(leader->zone(), leader->instance(), pack);
 			delete pack;
 			delete adv;
@@ -444,7 +435,6 @@ void AdventureManager::TryAdventureCreate(const char *data)
 				sfa->zone_in_object = finished_adventures[f]->GetTemplate()->zone_in_object_id;
 			}
 
-			pack->Deflate();
 			zoneserver_list.SendPacket(player->zone(), player->instance(), pack);
 			safe_delete_array(finished_adventures);
 			delete pack;
@@ -506,7 +496,6 @@ void AdventureManager::GetAdventureData(const char *name)
 				delete pack;
 				auto pack = new ServerPacket(ServerOP_AdventureDataClear, 64);
 				strcpy((char*)pack->pBuffer, name);
-				pack->Deflate();
 				zoneserver_list.SendPacket(player->zone(), player->instance(), pack);
 
 				delete pack;
@@ -525,7 +514,6 @@ void AdventureManager::GetAdventureData(const char *name)
 			sfa->zone_in_object = finished_adventures[i]->GetTemplate()->zone_in_object_id;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(player->zone(), player->instance(), pack);
 		safe_delete_array(finished_adventures);
 		delete pack;
@@ -757,7 +745,6 @@ void AdventureManager::PlayerClickedDoor(const char *player, int zone_id, int do
 						(*iter)->SetStatus(AS_WaitingForPrimaryEndTime);
 					}
 
-					pack->Deflate();
 					zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 					safe_delete(pack);
 				}
@@ -772,7 +759,6 @@ void AdventureManager::PlayerClickedDoor(const char *player, int zone_id, int do
 	{
 		auto pack = new ServerPacket(ServerOP_AdventureClickDoorError, 64);
 		strcpy((char*)pack->pBuffer, player);
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		safe_delete(pack);
 	}
@@ -790,7 +776,6 @@ void AdventureManager::LeaveAdventure(const char *name)
 			{
 				auto pack = new ServerPacket(ServerOP_AdventureLeaveDeny, 64);
 				strcpy((char*)pack->pBuffer, name);
-				pack->Deflate();
 				zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 				safe_delete(pack);
 			}
@@ -804,7 +789,6 @@ void AdventureManager::LeaveAdventure(const char *name)
 				current->RemovePlayer(name);
 				auto pack = new ServerPacket(ServerOP_AdventureLeaveReply, 64);
 				strcpy((char*)pack->pBuffer, name);
-				pack->Deflate();
 				zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 				safe_delete(pack);
 			}
@@ -813,7 +797,6 @@ void AdventureManager::LeaveAdventure(const char *name)
 		{
 			auto pack = new ServerPacket(ServerOP_AdventureLeaveReply, 64);
 			strcpy((char*)pack->pBuffer, name);
-			pack->Deflate();
 			zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 			safe_delete(pack);
 		}
@@ -1300,7 +1283,6 @@ void AdventureManager::DoLeaderboardRequestWins(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1367,7 +1349,6 @@ void AdventureManager::DoLeaderboardRequestPercentage(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1434,7 +1415,6 @@ void AdventureManager::DoLeaderboardRequestWinsGuk(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1501,7 +1481,6 @@ void AdventureManager::DoLeaderboardRequestPercentageGuk(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1568,7 +1547,6 @@ void AdventureManager::DoLeaderboardRequestWinsMir(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1635,7 +1613,6 @@ void AdventureManager::DoLeaderboardRequestPercentageMir(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1702,7 +1679,6 @@ void AdventureManager::DoLeaderboardRequestWinsMmc(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1769,7 +1745,6 @@ void AdventureManager::DoLeaderboardRequestPercentageMmc(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1836,7 +1811,6 @@ void AdventureManager::DoLeaderboardRequestWinsRuj(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1903,7 +1877,6 @@ void AdventureManager::DoLeaderboardRequestPercentageRuj(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -1970,7 +1943,6 @@ void AdventureManager::DoLeaderboardRequestWinsTak(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}
@@ -2037,7 +2009,6 @@ void AdventureManager::DoLeaderboardRequestPercentageTak(const char* player)
 			al->failure = our_failures;
 		}
 
-		pack->Deflate();
 		zoneserver_list.SendPacket(pc->zone(), pc->instance(), pack);
 		delete pack;
 	}

world/cliententry.cpp

@@ -311,7 +311,6 @@ void ClientListEntry::ProcessTellQueue()
 	while (it != tell_queue.end()) {
 		pack = new ServerPacket(ServerOP_ChannelMessage, sizeof(ServerChannelMessage_Struct) + strlen((*it)->message) + 1);
 		memcpy(pack->pBuffer, *it, pack->size);
-		pack->Deflate();
 		Server()->SendPacket(pack);
 		safe_delete(pack);
 		safe_delete_array(*it);

world/clientlist.cpp

@@ -742,7 +742,6 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S
 		}
 		iterator.Advance();
 	}
-	pack2->Deflate();
 	//zoneserver_list.SendPacket(pack2); // NO NO NO WHY WOULD YOU SEND IT TO EVERY ZONE SERVER?!?
 	SendPacket(to,pack2);
 	safe_delete(pack2);
@@ -888,7 +887,6 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon
 			bufptr += sizeof(WhoAllPlayerPart4);
 
 		}
-		pack2->Deflate();
 		SendPacket(FriendsWho->FromName,pack2);
 		safe_delete(pack2);
 	}
@@ -963,7 +961,6 @@ void ClientList::SendLFGMatches(ServerLFGMatchesRequest_Struct *smrs) {
 			}
 			Iterator.Advance();
 		}
-		Pack->Deflate();
 	}
 	SendPacket(smrs->FromName,Pack);
 	safe_delete(Pack);

world/lfplist.cpp

@@ -261,7 +261,6 @@ void GroupLFPList::SendLFPMatches(ServerLFPMatchesRequest_Struct* smrs) {
 				Buffer++;
 			}
 		}
-		Pack->Deflate();
 	}
 
 	ClientListEntry* CLE = client_list.FindCharacter(smrs->FromName);

world/zonelist.cpp

@@ -429,7 +429,6 @@ void ZSList::SendChannelMessageRaw(const char* from, const char* to, uint8 chan_
 	scm->chan_num = chan_num;
 	strcpy(&scm->message[0], message);
 
-	pack->Deflate();
 	SendPacket(pack);
 	delete pack;
 }
@@ -473,7 +472,7 @@ void ZSList::SendEmoteMessageRaw(const char* to, uint32 to_guilddbid, int16 to_m
 	char tempto[64]={0};
 	if(to)
 		strn0cpy(tempto,to,64);
-	pack->Deflate();
+
 	if (tempto[0] == 0) {
 		SendPacket(pack);
 	}

world/zoneserver.cpp

@@ -66,9 +66,9 @@ ZoneServer::ZoneServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> conn
 	is_static_zone = false;
 	zone_player_count = 0;
 
-	tcpc->OnAnyMessage(std::bind(&ZoneServer::HandleMessage, this, std::placeholders::_1, std::placeholders::_2));
+	tcpc->OnMessage(std::bind(&ZoneServer::HandleMessage, this, std::placeholders::_1, std::placeholders::_2));
 
-	boot_timer_obj.reset(new EQ::Timer(1000, true, [this](EQ::Timer *obj) {
+	boot_timer_obj.reset(new EQ::Timer(100, true, [this](EQ::Timer *obj) {
 		if (zone_boot_timer.Check()) {
 			LSBootUpdate(GetZoneID(), true);
 			zone_boot_timer.Disable();
@@ -1329,7 +1329,6 @@ void ZoneServer::SendEmoteMessageRaw(const char* to, uint32 to_guilddbid, int16
 	sem->type = type;
 	strcpy(&sem->message[0], message);
 
-	pack->Deflate();
 	SendPacket(pack);
 	delete pack;
 }