From 56fdc6aaac30f17bb227e21919247ea95bc2755d Mon Sep 17 00:00:00 2001
From: KimLS <KLS@peqtgc.com>
Date: Fri, 10 Mar 2017 23:31:51 -0800
Subject: [PATCH] Change default settings

---
 common/net/daybreak_connection.cpp | 48 ++++++++++++++++++++----------
 common/net/daybreak_connection.h   | 10 +++----
 zone/net.cpp                       |  2 +-
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/common/net/daybreak_connection.cpp b/common/net/daybreak_connection.cpp
index 0b44628ed..1be949a81 100644
--- a/common/net/daybreak_connection.cpp
+++ b/common/net/daybreak_connection.cpp
@@ -407,24 +407,42 @@ void EQ::Net::DaybreakConnection::ProcessPacket(Packet &p)
 			return;
 		}
 
-		EQ::Net::DynamicPacket temp;
-		temp.PutPacket(0, p);
-		temp.Resize(temp.Length() - m_crc_bytes);
+		if (m_encode_passes[0] == EncodeCompression || m_encode_passes[1] == EncodeCompression)
+		{
+			EQ::Net::DynamicPacket temp;
+			temp.PutPacket(0, p);
+			temp.Resize(temp.Length() - m_crc_bytes);
 
-		for (int i = 1; i >= 0; --i) {
-			switch (m_encode_passes[i]) {
-			case EncodeCompression:
-				Decompress(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
-				break;
-			case EncodeXOR:
-				Decode(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
-				break;
-			default:
-				break;
+			for (int i = 1; i >= 0; --i) {
+				switch (m_encode_passes[i]) {
+				case EncodeCompression:
+					Decompress(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
+					break;
+				case EncodeXOR:
+					Decode(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
+					break;
+				default:
+					break;
+				}
 			}
-		}
 
-		ProcessDecodedPacket(StaticPacket(temp.Data(), temp.Length()));
+			ProcessDecodedPacket(StaticPacket(temp.Data(), temp.Length()));
+		}
+		else {
+			EQ::Net::StaticPacket temp(p.Data(), p.Length() - m_crc_bytes);
+
+			for (int i = 1; i >= 0; --i) {
+				switch (m_encode_passes[i]) {
+				case EncodeXOR:
+					Decode(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
+					break;
+				default:
+					break;
+				}
+			}
+
+			ProcessDecodedPacket(StaticPacket(temp.Data(), temp.Length()));
+		}
 	}
 	else {
 		ProcessDecodedPacket(p);
diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h
index 53d10f3d6..dac27bc05 100644
--- a/common/net/daybreak_connection.h
+++ b/common/net/daybreak_connection.h
@@ -218,11 +218,11 @@ namespace EQ
 			DaybreakConnectionManagerOptions() {
 				max_connection_count = 0;
 				keepalive_delay_ms = 9000;
-				resend_delay_ms = 250;
+				resend_delay_ms = 300;
 				resend_delay_factor = 1.5;
-				resend_delay_max = 2500;
+				resend_delay_max = 5000;
 				stats_delay_ms = 9000;
-				connect_delay_ms = 250;
+				connect_delay_ms = 500;
 				stale_connection_ms = 60000;
 				connect_stale_ms = 5000;
 				crc_length = 2;
@@ -231,10 +231,10 @@ namespace EQ
 				encode_passes[1] = DaybreakEncodeType::EncodeNone;
 				port = 0;
 				hold_size = 384;
-				hold_length_ms = 50;
+				hold_length_ms = 10;
 				simulated_in_packet_loss = 0;
 				simulated_out_packet_loss = 0;
-				tic_rate_hertz = 20.0;
+				tic_rate_hertz = 10.0;
 			}
 
 			size_t max_packet_size;
diff --git a/zone/net.cpp b/zone/net.cpp
index 131a052e1..68c3446e7 100644
--- a/zone/net.cpp
+++ b/zone/net.cpp
@@ -451,7 +451,7 @@ int main(int argc, char** argv) {
 			if (!eqsf_open && Config->ZonePort != 0) {
 				Log.Out(Logs::General, Logs::Zone_Server, "Starting EQ Network server on port %d", Config->ZonePort);
 				
-				EQ::Net::EQStreamManagerOptions opts(Config->ZonePort, false, true);
+				EQ::Net::EQStreamManagerOptions opts(Config->ZonePort, false, false);
 				eqsm.reset(new EQ::Net::EQStreamManager(opts));
 				eqsf_open = true;