LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-05 09:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unglob std::shared_ptr

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:20:45 -06:00
parent 0dd1654dec
commit 67ceccf2d4
1065 changed files with 5754 additions and 5749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Minecraft.World/Network/Connection.cpp
View File

@@ -141,7 +141,7 @@ void Connection::setListener(PacketListener *packetListener)
this->packetListener = packetListener;
}
void Connection::send(shared_ptr<Packet> packet)
void Connection::send(std::shared_ptr<Packet> packet)
{
if (quitting) return;
@@ -167,7 +167,7 @@ void Connection::send(shared_ptr<Packet> packet)
}
void Connection::queueSend(shared_ptr<Packet> packet)
void Connection::queueSend(std::shared_ptr<Packet> packet)
{
if (quitting) return;
estimatedRemaining += packet->getEstimatedSize() + 1;
@@ -185,7 +185,7 @@ bool Connection::writeTick()
// try {
if (!outgoing.empty() && (fakeLag == 0 || System::currentTimeMillis() - outgoing.front()->createTime >= fakeLag))
{
shared_ptr<Packet> packet;
std::shared_ptr<Packet> packet;
EnterCriticalSection(&writeLock);
@@ -218,7 +218,7 @@ bool Connection::writeTick()
if ((slowWriteDelay-- <= 0) && !outgoing_slow.empty() && (fakeLag == 0 || System::currentTimeMillis() - outgoing_slow.front()->createTime >= fakeLag))
{
shared_ptr<Packet> packet;
std::shared_ptr<Packet> packet;
//synchronized (writeLock) {
@@ -296,7 +296,7 @@ bool Connection::readTick()
//try {
shared_ptr<Packet> packet = Packet::readPacket(dis, packetListener->isServerPacketListener());
std::shared_ptr<Packet> packet = Packet::readPacket(dis, packetListener->isServerPacketListener());
if (packet != NULL)
{
@@ -446,7 +446,7 @@ void Connection::tick()
tickCount++;
if (tickCount % 20 == 0)
{
send( shared_ptr<KeepAlivePacket>( new KeepAlivePacket() ) );
send( std::shared_ptr<KeepAlivePacket>( new KeepAlivePacket() ) );
}
// 4J Stu - 1.8.2 changed from 100 to 1000
@@ -461,10 +461,10 @@ void Connection::tick()
EnterCriticalSection(&incoming_cs);
// 4J Stu - If disconnected, then we shouldn't process incoming packets
std::vector< shared_ptr<Packet> > packetsToHandle;
std::vector< std::shared_ptr<Packet> > packetsToHandle;
while (!disconnected && !g_NetworkManager.IsLeavingGame() && g_NetworkManager.IsInSession() && !incoming.empty() && max-- >= 0)
{
shared_ptr<Packet> packet = incoming.front();
std::shared_ptr<Packet> packet = incoming.front();
packetsToHandle.push_back(packet);
incoming.pop();
}