From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.World/Packet.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Minecraft.World/Packet.cpp') diff --git a/Minecraft.World/Packet.cpp b/Minecraft.World/Packet.cpp index 48e203f7..8bac8629 100644 --- a/Minecraft.World/Packet.cpp +++ b/Minecraft.World/Packet.cpp @@ -207,7 +207,7 @@ void Packet::map(int id, bool receiveOnClient, bool receiveOnServer, bool sendTo } // 4J Added to record data for outgoing packets -void Packet::recordOutgoingPacket(std::shared_ptr packet) +void Packet::recordOutgoingPacket(shared_ptr packet) { #ifndef _CONTENT_PACKAGE #if PACKET_ENABLE_STAT_TRACKING @@ -285,7 +285,7 @@ int64_t Packet::getIndexedStatValue(unsigned int samplePos, unsigned int rendera } -std::shared_ptr Packet::getPacket(int id) +shared_ptr Packet::getPacket(int id) { // 4J - removed try/catch // try @@ -326,7 +326,7 @@ byteArray Packet::readBytes(DataInputStream *datainputstream) } -bool Packet::canSendToAnyClient(std::shared_ptr packet) +bool Packet::canSendToAnyClient(shared_ptr packet) { int packetId = packet->getId(); @@ -345,10 +345,10 @@ unordered_map Packet::statistics = unordered_ma //int Packet::nextPrint = 0; -std::shared_ptr Packet::readPacket(DataInputStream *dis, bool isServer) // throws IOException TODO 4J JEV, should this declare a throws? +shared_ptr Packet::readPacket(DataInputStream *dis, bool isServer) // throws IOException TODO 4J JEV, should this declare a throws? { int id = 0; - std::shared_ptr packet = nullptr; + shared_ptr packet = nullptr; // 4J - removed try/catch // try @@ -399,7 +399,7 @@ std::shared_ptr Packet::readPacket(DataInputStream *dis, bool isServer) return packet; } -void Packet::writePacket(std::shared_ptr packet, DataOutputStream *dos) // throws IOException TODO 4J JEV, should this declare a throws? +void Packet::writePacket(shared_ptr packet, DataOutputStream *dos) // throws IOException TODO 4J JEV, should this declare a throws? { //app.DebugPrintf("Writing packet %d\n", packet->getId()); dos->write(packet->getId()); @@ -519,7 +519,7 @@ bool Packet::canBeInvalidated() return false; } -bool Packet::isInvalidatedBy(std::shared_ptr packet) +bool Packet::isInvalidatedBy(shared_ptr packet) { return false; } @@ -530,16 +530,16 @@ bool Packet::isAync() } // 4J Stu - Brought these functions forward for enchanting/game rules -std::shared_ptr Packet::readItem(DataInputStream *dis) +shared_ptr Packet::readItem(DataInputStream *dis) { - std::shared_ptr item = nullptr; + shared_ptr item = nullptr; int id = dis->readShort(); if (id >= 0) { int count = dis->readByte(); int damage = dis->readShort(); - item = std::shared_ptr( new ItemInstance(id, count, damage) ); + item = shared_ptr( new ItemInstance(id, count, damage) ); // 4J Stu - Always read/write the tag //if (Item.items[id].canBeDepleted() || Item.items[id].shouldOverrideMultiplayerNBT()) { @@ -550,7 +550,7 @@ std::shared_ptr Packet::readItem(DataInputStream *dis) return item; } -void Packet::writeItem(std::shared_ptr item, DataOutputStream *dos) +void Packet::writeItem(shared_ptr item, DataOutputStream *dos) { if (item == NULL) { -- cgit v1.2.3