diff --git a/SQCSim-common/bullet.cpp b/SQCSim-common/bullet.cpp index ab3d18e..b55d8af 100644 --- a/SQCSim-common/bullet.cpp +++ b/SQCSim-common/bullet.cpp @@ -18,10 +18,10 @@ bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordere for (auto& [key, player] : mapPlayer) { bool hit = false; - if ((m_currentpos - player->GetPosition()).Length() < .5f) { + if ((m_currentpos - player->GetPosition()).Length() < 1.5f) { hit = true; } - else if ((m_currentpos - player->GetPOV()).Length() < .2f) { + else if ((m_currentpos - player->GetPOV()).Length() < .7f) { damage *= 2; // HEADSHOT! hit = true; } diff --git a/SQCSim-srv/server.cpp b/SQCSim-srv/server.cpp index 70b5c05..93df310 100644 --- a/SQCSim-srv/server.cpp +++ b/SQCSim-srv/server.cpp @@ -276,7 +276,8 @@ void Server::Run() { default: break; } } - lsPck.clear(); + if (!lsPck.empty()) + lsPck.clear(); /* Process */ @@ -311,7 +312,8 @@ void Server::Run() { else { for (auto& chmo : conn->ChunkDiffs) chunkdiffs.emplace_back(std::move(chmo)); - conn->ChunkDiffs.clear(); + if (!conn->ChunkDiffs.empty()) + conn->ChunkDiffs.clear(); for (auto& bull : conn->Bullets) { bullets.emplace_back(bull); @@ -323,7 +325,8 @@ void Server::Run() { netbull.emplace_back(std::move(nbul)); } - conn->Bullets.clear(); + if (!conn->Bullets.empty()) + conn->Bullets.clear(); } } /* Out */