Loading...   


 common/eq_stream.cpp   | 1 +
 zone/client_packet.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/eq_stream.cpp b/common/eq_stream.cpp
index 3438f53..6d3a60e 100644
--- a/common/eq_stream.cpp
+++ b/common/eq_stream.cpp
@@ -489,6 +489,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 					} else {
 						retransmittimeout = ntohl(ClientStats->average_delta) * 2 * RETRANSMIT_TIMEOUT_MULT;
 					}
+					retransmittimeout += 300;
 					if(retransmittimeout > RETRANSMIT_TIMEOUT_MAX)
 						retransmittimeout = RETRANSMIT_TIMEOUT_MAX;
 					Log.Out(Logs::Detail, Logs::Netcode, _L "Retransmit timeout recalculated to %dms" __L, retransmittimeout);
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index fb7216b..912bc84 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -750,8 +750,6 @@ void Client::CompleteConnect()
 
 	entity_list.SendTraders(this);
 
-	zoneinpacket_timer.Start();
-
 	if (GetPet()){
 		GetPet()->SendPetBuffsToClient();
 	}
@@ -1657,7 +1655,8 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	sze->player.spawn.NPC = 0;
 	sze->player.spawn.z += 6;	//arbitrary lift, seems to help spawning under zone.
 	outapp->priority = 6;
-	FastQueuePacket(&outapp);
+	QueuePacket(outapp);
+	safe_delete(outapp);
 
 	/* Zone Spawns Packet */
 	entity_list.SendZoneSpawnsBulk(this);
@@ -1730,6 +1729,8 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	SetAttackTimer();
 	conn_state = ZoneInfoSent;
 
+	zoneinpacket_timer.Start();
+
 	return;
 }
 

Raw Paste Data