diff options
| author | void_17 <heroerror3@gmail.com> | 2026-03-02 17:37:16 +0700 |
|---|---|---|
| committer | void_17 <heroerror3@gmail.com> | 2026-03-02 17:37:16 +0700 |
| commit | 119bff351450ea16ffda550b6e0f67379b29f708 (patch) | |
| tree | d9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/Packet.h | |
| parent | 8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff) | |
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/Packet.h')
| -rw-r--r-- | Minecraft.World/Packet.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Minecraft.World/Packet.h b/Minecraft.World/Packet.h index 46499e0c..0bafe443 100644 --- a/Minecraft.World/Packet.h +++ b/Minecraft.World/Packet.h @@ -10,7 +10,7 @@ class DataOutputStream; class Packet; -typedef std::shared_ptr<Packet> (*packetCreateFn)(); +typedef shared_ptr<Packet> (*packetCreateFn)(); class Packet { @@ -62,10 +62,10 @@ public: Packet(); - static std::shared_ptr<Packet> getPacket(int id); + static shared_ptr<Packet> getPacket(int id); // 4J Added - static bool canSendToAnyClient(std::shared_ptr<Packet> packet); + static bool canSendToAnyClient(shared_ptr<Packet> packet); static void writeBytes(DataOutputStream *dataoutputstream, byteArray bytes); static byteArray readBytes(DataInputStream *datainputstream); @@ -80,7 +80,7 @@ private: static vector<PacketStatistics *> renderableStats; static int renderPos; public: - static void recordOutgoingPacket(std::shared_ptr<Packet> packet); + static void recordOutgoingPacket(shared_ptr<Packet> packet); static void renderPacketStats(int id); static void renderAllPacketStats(); static void renderAllPacketStatsKey(); @@ -91,8 +91,8 @@ private : //static int nextPrint; public: - static std::shared_ptr<Packet> readPacket(DataInputStream *dis, bool isServer); - static void writePacket(std::shared_ptr<Packet> packet, DataOutputStream *dos); + static shared_ptr<Packet> readPacket(DataInputStream *dis, bool isServer); + static void writePacket(shared_ptr<Packet> packet, DataOutputStream *dos); static void writeUtf(const wstring& value, DataOutputStream *dos); static wstring readUtf(DataInputStream *dis, int maxLength); virtual void read(DataInputStream *dis) = 0; // throws IOException = 0; TODO 4J JEV, should this declare a throws? @@ -100,12 +100,12 @@ public: virtual void handle(PacketListener *listener) = 0; virtual int getEstimatedSize() = 0; virtual bool canBeInvalidated(); - virtual bool isInvalidatedBy(std::shared_ptr<Packet> packet); + virtual bool isInvalidatedBy(shared_ptr<Packet> packet); virtual bool isAync(); // 4J Stu - Brought these functions forward for enchanting/game rules - static std::shared_ptr<ItemInstance> readItem(DataInputStream *dis); - static void writeItem(std::shared_ptr<ItemInstance> item, DataOutputStream *dos); + static shared_ptr<ItemInstance> readItem(DataInputStream *dis); + static void writeItem(shared_ptr<ItemInstance> item, DataOutputStream *dos); static CompoundTag *readNbt(DataInputStream *dis); protected: |
