backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: address PR reviewer feedback regarding random_shuffle and queue.empty()

Browse source
This commit is contained in:
zukrmn 2026-03-07 04:57:43 +00:00 committed by JuiceyDev
parent 42b0352ec3
commit c122bff122
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Minecraft.World/Entities/Mobs/Villager.cpp
View file

@ -530,8 +530,7 @@ void Villager::addOffers(int addCount)
} }
// shuffle the list to make it more interesting // shuffle the list to make it more interesting
std::random_device rd; static thread_local std::mt19937 g(std::random_device{}());
std::mt19937 g(rd());
std::shuffle(newOffers->begin(), newOffers->end(), g); std::shuffle(newOffers->begin(), newOffers->end(), g);
if (offers == NULL) if (offers == NULL)

4
Minecraft.World/Network/Socket.cpp
View file

@ -344,7 +344,7 @@ void Socket::SocketInputStreamLocal::close()
{ {
m_streamOpen = false; m_streamOpen = false;
EnterCriticalSection(&s_hostQueueLock[m_queueIdx]); EnterCriticalSection(&s_hostQueueLock[m_queueIdx]);
while(!s_hostQueue[m_queueIdx].empty()) s_hostQueue[m_queueIdx].pop(); std::queue<uint8_t>().swap(s_hostQueue[m_queueIdx]);
LeaveCriticalSection(&s_hostQueueLock[m_queueIdx]); LeaveCriticalSection(&s_hostQueueLock[m_queueIdx]);
} }
@ -392,7 +392,7 @@ void Socket::SocketOutputStreamLocal::close()
{ {
m_streamOpen = false; m_streamOpen = false;
EnterCriticalSection(&s_hostQueueLock[m_queueIdx]); EnterCriticalSection(&s_hostQueueLock[m_queueIdx]);
while(!s_hostQueue[m_queueIdx].empty()) s_hostQueue[m_queueIdx].pop(); std::queue<uint8_t>().swap(s_hostQueue[m_queueIdx]);
LeaveCriticalSection(&s_hostQueueLock[m_queueIdx]); LeaveCriticalSection(&s_hostQueueLock[m_queueIdx]);
} }