From 1065357e70520c740ee05d0d9e783f9355c35ec1 Mon Sep 17 00:00:00 2001
From: MarcEricMartel <marcericmartel@gmail.com>
Date: Sat, 16 Dec 2023 15:05:06 -0500
Subject: [PATCH] Eh?

---
 SQCSim-common/netprotocol.cpp |  8 ++++----
 SQCSim-srv/server.cpp         | 21 +++++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/SQCSim-common/netprotocol.cpp b/SQCSim-common/netprotocol.cpp
index 68feda2..d9b5b73 100644
--- a/SQCSim-common/netprotocol.cpp
+++ b/SQCSim-common/netprotocol.cpp
@@ -1173,11 +1173,11 @@ netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
 }
 
 void netprot::recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck) {
-	int len = buf->tmp ? buf->tmp - buf->ptr : 0,
+	int len = 0,//buf->tmp ? buf->tmp - buf->ptr : 0,
 		end = 0;
-	char* cursor = buf->tmp ? buf->tmp : nullptr,
-		* next = buf->tmp ? buf->tmp + 1 : buf->ptr,
-		* last = buf->tmp ? buf->tmp : buf->ptr;
+	char* cursor = nullptr,//buf->tmp ? buf->tmp : nullptr,
+		* next = buf->ptr,//buf->tmp ? buf->tmp + 1 : buf->ptr,
+		* last = buf->ptr,//buf->tmp ? buf->tmp : buf->ptr;
 	bool ended = true;
 	struct pollfd fds[1];
 
diff --git a/SQCSim-srv/server.cpp b/SQCSim-srv/server.cpp
index 1113a9a..1eefbf2 100644
--- a/SQCSim-srv/server.cpp
+++ b/SQCSim-srv/server.cpp
@@ -374,15 +374,13 @@ void Server::Run() {
 					sendPackTo<BulletAdd>(m_sock_udp, bull, &m_buf, conn->getAddr());
 			delete bull;
 		}
-		netbull.clear();
+		if (!netbull.empty())
+			netbull.clear();
 
-		if (!bullets.empty())
-			std::cout << "Bullets: " << bullets.size() << std::endl;
-		
 		for (auto bull = bullets.begin(); bull != bullets.end(); ++bull) {
 			ChunkMod* cmod = nullptr;
 			Bullet* bullet = *bull;
-			if (bullet->Update(m_world, (1. / 60.), 20, m_players, &cmod)) {
+			if (bullet->Update(m_world, (1. / 60.), 1, m_players, &cmod)) {
 				if (cmod)
 					chunkdiffs.emplace_back(cmod);
 				bullit.push_back(bull);
@@ -392,7 +390,12 @@ void Server::Run() {
 
 		for (auto& bull: bullit)
 			bullets.erase(bull);
-		bullit.clear();
+
+		if (!bullets.empty())
+			bullets.clear();
+
+		if (!bullit.empty())
+			bullit.clear();
 
 		for (auto& chat : chatlog) {
 			Log(chat->mess, false, false);
@@ -400,14 +403,16 @@ void Server::Run() {
 				sendPackTo<Chat>(m_sock_udp, chat, &m_buf, conn->getAddr());
 			delete chat;
 		}
-		chatlog.clear();
+		if (!chatlog.empty())
+			chatlog.clear();
 
 		for (auto& chmo : chunkdiffs) {
 			for (auto& [key, conn] : m_conns)
 				sendPackTo<ChunkMod>(m_sock_udp, chmo, &m_buf, conn->getAddr());
 			delete chmo;
 		}
-		chunkdiffs.clear();
+		if (!chunkdiffs.empty())
+			chunkdiffs.clear();
 	}
 
 	Chat end;