From 9750d09635d6360b42f9f5706ee9cbf1b3521adf Mon Sep 17 00:00:00 2001
From: KimLS <KLS@peqtgc.com>
Date: Sat, 1 Apr 2017 17:25:48 -0700
Subject: [PATCH] Change default settings and removal of unacked packets for
 now

---
 common/bodytypes.h               |  1 +
 common/net/daybreak_connection.h | 10 +++++-----
 common/net/eqstream.cpp          |  5 +----
 zone/net.cpp                     |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/common/bodytypes.h b/common/bodytypes.h
index 804506e7a..fd64b1825 100644
--- a/common/bodytypes.h
+++ b/common/bodytypes.h
@@ -35,6 +35,7 @@ typedef enum {
 	BT_Greater_Akheva	= 14,
 	BT_Khati_Sha		= 15,
 	BT_Seru				= 16,	//not confirmed....
+	BT_Draz_Nurakk      = 18,
 	BT_Zek				= 19,
 	BT_Luggald			= 20,
 	BT_Animal			= 21,
diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h
index 782a23fd2..fb81da818 100644
--- a/common/net/daybreak_connection.h
+++ b/common/net/daybreak_connection.h
@@ -212,21 +212,21 @@ namespace EQ
 				resend_delay_ms = 300;
 				resend_delay_factor = 1.5;
 				resend_delay_min = 50;
-				resend_delay_max = 2000;
+				resend_delay_max = 1000;
 				connect_delay_ms = 500;
-				stale_connection_ms = 60000;
+				stale_connection_ms = 90000;
 				connect_stale_ms = 5000;
 				crc_length = 2;
 				max_packet_size = 512;
 				encode_passes[0] = DaybreakEncodeType::EncodeNone;
 				encode_passes[1] = DaybreakEncodeType::EncodeNone;
 				port = 0;
-				hold_size = 448;
-				hold_length_ms = 25;
+				hold_size = 384;
+				hold_length_ms = 10;
 				simulated_in_packet_loss = 0;
 				simulated_out_packet_loss = 0;
 				tic_rate_hertz = 60.0;
-				resend_timeout = 60000;
+				resend_timeout = 90000;
 				connection_close_time = 2000;
 			}
 
diff --git a/common/net/eqstream.cpp b/common/net/eqstream.cpp
index 6d02fdd57..a366fe1a2 100644
--- a/common/net/eqstream.cpp
+++ b/common/net/eqstream.cpp
@@ -81,10 +81,7 @@ void EQ::Net::EQStream::QueuePacket(const EQApplicationPacket *p, bool ack_req)
 			break;
 		}
 
-		if (ack_req)
-			m_connection->QueuePacket(out);
-		else
-			m_connection->QueuePacket(out, 0, false);
+		m_connection->QueuePacket(out);
 	}
 }
 
diff --git a/zone/net.cpp b/zone/net.cpp
index e214030ea..bc098c369 100644
--- a/zone/net.cpp
+++ b/zone/net.cpp
@@ -447,7 +447,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;